Merge pull request #2 from tacaswell/bad_linestyle

lennart0901 · lennart0901 · commit 608ad2113378 · 2014-11-21T20:13:48.000+01:00
ENH : raise on invalid linestyle
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -971,10 +971,18 @@ def set_linestyle(self, linestyle):
                     linestyle = '-'
                 break
 
-        if linestyle not in self._lineStyles:
-            linestyle = ls_mapper_r.get(linestyle, linestyle)
-        if linestyle in [' ', '']:
+        if linestyle in [' ', '', 'none']:
             linestyle = 'None'
+
+        if linestyle not in self._lineStyles:
+            try:
+                linestyle = ls_mapper_r[linestyle]
+            except KeyError:
+                raise ValueError(("You passed in an invalid linestyle, "
+                                  "`{}`.  See "
+                                  "docs of Line2D.set_linestyle for "
+                                  "valid values.").format(linestyle))
+
         self._linestyle = linestyle
 
     @docstring.dedent_interpd
diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
@@ -6,12 +6,14 @@
 
 import six
 
-from nose.tools import assert_true
+import nose
+from nose.tools import assert_true, assert_raises
 from timeit import repeat
 import numpy as np
 import matplotlib as mpl
 import matplotlib.pyplot as plt
 from matplotlib.testing.decorators import cleanup, image_comparison
+import sys
 
 
 @cleanup
@@ -104,6 +106,17 @@ def test_linestyle_variants():
     assert True
 
 
+@cleanup
+def test_valid_linestyles():
+    if sys.version_info[:2] < (2, 7):
+        raise nose.SkipTest("assert_raises as context manager "
+                            "not supported with Python < 2.7")
+
+    line = mpl.lines.Line2D([], [])
+    with assert_raises(ValueError):
+        line.set_linestyle('aardvark')
+
+
 @image_comparison(baseline_images=['line_collection_dashes'], remove_text=True)
 def test_set_line_coll_dash_image():
     fig = plt.figure()
@@ -121,5 +134,4 @@ def test_nan_is_sorted():
 
 
 if __name__ == '__main__':
-    import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
