remove type checking for strings in '_validate_linestyle'

afvincent · afvincent · commit 017a88ffe9f2 · 2017-02-27T16:16:39.000+01:00
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -910,9 +910,13 @@ def _validate_linestyle(ls):
     A validator for all possible line styles, the named ones *and*
     the on-off ink sequences.
     """
-    # Named line style, like u'--' or u'solid'
-    if isinstance(ls, six.text_type):
+    # Look first for a valid named line style, like '--' or 'solid'
+    try:
         return _validate_named_linestyle(ls)
+    except (KeyError, AttributeError):
+        # AttributeError may be raised by ls.lower() that can be called
+        # inside _validate_named_linestyle.
+        pass
 
     # On-off ink (in points) sequence *of even length*.
     # Offset is set to None.
@@ -926,7 +930,7 @@ def _validate_linestyle(ls):
         # (called inside the instance of validate_nseq_float).
         pass
 
-    raise ValueError("linestyle must be a string or " +
+    raise ValueError("linestyle must be a valid string or " +
                      "an even-length sequence of floats.")
 
 
