Merge pull request #4231 from cpcloud/matplotlib-invalid-colomap-test

BUG: raise on invalid colormap for older mpl

Author: cpcloud

doc/source/release.rst

@@ -331,6 +331,8 @@ pandas 0.12
   - Fixed bug in ``Series.where`` where broadcasting a single element input vector
     to the length of the series resulted in multiplying the value
     inside the input (:issue:`4192`)
+  - Fixed bug in plotting that wasn't raising on invalid colormap for
+    matplotlib 1.1.1 (:issue:`4215`)
 
 pandas 0.11.0
 =============

doc/source/v0.12.0.txt

@@ -463,6 +463,8 @@ Bug Fixes
     argument in ``to_datetime`` (:issue:`4152`)
   - Fixed bug in ``PandasAutoDateLocator`` where ``invert_xaxis`` triggered
     incorrectly ``MilliSecondLocator``  (:issue:`3990`)
+  - Fixed bug in plotting that wasn't raising on invalid colormap for
+    matplotlib 1.1.1 (:issue:`4215`)
 
 See the :ref:`full release notes
 <release>` or issue tracker

pandas/tests/test_graphics.py

@@ -990,8 +990,7 @@ def test_option_mpl_style(self):
             pass
 
     def test_invalid_colormap(self):
-        df = DataFrame(np.random.randn(500, 2), columns=['A', 'B'])
-
+        df = DataFrame(np.random.randn(3, 2), columns=['A', 'B'])
         self.assertRaises(ValueError, df.plot, colormap='invalid_colormap')
 
 

pandas/tools/plotting.py

@@ -91,14 +91,17 @@
 def _get_standard_kind(kind):
     return {'density': 'kde'}.get(kind, kind)
 
-def _get_standard_colors(num_colors=None, colormap=None,
-                        color_type='default', color=None):
+def _get_standard_colors(num_colors=None, colormap=None, color_type='default',
+                         color=None):
     import matplotlib.pyplot as plt
 
     if color is None and colormap is not None:
         if isinstance(colormap, basestring):
             import matplotlib.cm as cm
+            cmap = colormap
             colormap = cm.get_cmap(colormap)
+            if colormap is None:
+                raise ValueError("Colormap {0} is not recognized".format(cmap))
         colors = map(colormap, np.linspace(0, 1, num=num_colors))
     elif color is not None:
         if colormap is not None: