Full support for string cmaps.

pelson · pelson · commit f37729d69a2f · 2012-06-16T15:02:15.000+01:00
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -151,8 +151,8 @@ def get_cmap(name=None, lut=None):
             return cmap_d[name]
         elif name in datad:
             return _generate_cmap(name, lut)
-        else:
-            raise ValueError("Colormap %s is not recognized" % name)
+
+    raise ValueError("Colormap %s is not recognized" % name)
 
 class ScalarMappable:
     """
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -766,7 +766,6 @@ def __init__(self, ax, *args, **kwargs):
         if self.origin is not None: assert(self.origin in
                                             ['lower', 'upper', 'image'])
         if self.extent is not None: assert(len(self.extent) == 4)
-        if cmap is not None: assert(isinstance(cmap, colors.Colormap))
         if self.colors is not None and cmap is not None:
             raise ValueError('Either colors or cmap must be None')
         if self.origin == 'image': self.origin = mpl.rcParams['image.origin']
diff --git a/lib/matplotlib/streamplot.py b/lib/matplotlib/streamplot.py
@@ -5,7 +5,7 @@
 import numpy as np
 import matplotlib
 import matplotlib.patches as patches
-
+from matplotlib.cm import get_cmap
 
 __all__ = ['streamplot']
 
@@ -105,7 +105,9 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
         if norm is None:
             norm = matplotlib.colors.normalize(color.min(), color.max())
         if cmap is None:
-            cmap = matplotlib.cm.get_cmap(matplotlib.rcParams['image.cmap'])
+            cmap = get_cmap(matplotlib.rcParams['image.cmap'])
+        else:
+            cmap = get_cmap(cmap)
 
     streamlines = []
     for t in trajectories:
