Merge pull request #1 from matplotlib/master

pulling in changes to my local version

Author: kthyng

cmocean/tools.py

@@ -2,10 +2,18 @@
 Plot up stuff with colormaps.
 '''
 
+import sys
+
 import numpy as np
 import matplotlib as mpl
 
 
+if sys.version_info > (3,):
+    _string_types = (str, np.str_, np.unicode_)
+else:
+    _string_types = (basestring, np.str_, np.unicode_)
+
+
 def print_colormaps(cmaps, N=256, returnrgb=True, savefiles=False):
     '''Print colormaps in 256 RGB colors to text files.
 
@@ -73,7 +81,7 @@ def cmap(rgbin, N=256):
     '''
 
     # rgb inputs here
-    if not mpl.cbook.is_string_like(rgbin[0]):
+    if not isinstance(rgbin[0], _string_types):
         # normalize to be out of 1 if out of 256 instead
         if rgbin.max() > 1:
             rgbin = rgbin/256.

docs/source/index.rst

@@ -363,6 +363,7 @@ cmocean available elsewhere!
 * For `Paraview <https://github.com/kthyng/cmocean-paraview>`_, inspired by `Phillip Wolfram <https://github.com/pwolfram>`_.
 * In `Plotly <https://plot.ly/python/cmocean-colorscales/>`_
 * Chad Greene's `Antartic Mapping Tools <http://www.mathworks.com/matlabcentral/fileexchange/47638-antarctic-mapping-tools>`_ in Matlab uses cmocean
+* For `Tableau <https://www.tableau.com>`_ as a preferences file on `github <https://github.com/shaunwbell/cmocean_tableau>`_
 .. * In PyNcView: coming soon!
 
 Examples of beautiful visualizations: