BUG : properly handle 'none' as linestyle

tacaswell · lennart0901 · commit dd4eaa05d4c3 · 2015-04-12T11:26:00.000+02:00
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -976,15 +976,18 @@ def set_linestyle(self, linestyle):
                     linestyle = '-'
                 break
 
+        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")
-        if linestyle in [' ', '']:
-            linestyle = 'None'
+                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
