Re-add some type checking to avoid FutureWarning w/ a Numpy array

afvincent · afvincent · commit 64f81fca2321 · 2017-03-09T21:31:57.000+01:00
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -915,12 +915,11 @@ def _validate_linestyle(ls):
     the on-off ink sequences.
     """
     # 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
+    if isinstance(ls, six.string_types):
+        try:
+            return _validate_named_linestyle(ls)
+        except KeyError:
+            pass
 
     # On-off ink (in points) sequence *of even length*.
     # Offset is set to None.
