replace collections.Sized check with np.size to better handle masked elements in errorbar

astromancer · astromancer · commit d0c5321a30eb · 2017-09-28T01:06:35.000+02:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -4,7 +4,6 @@
 import six
 from six.moves import xrange, zip, zip_longest
 
-from collections import Sized
 import functools
 import itertools
 import math
@@ -3020,8 +3019,7 @@ def extract_err(err, data):
             # special case for empty lists
             if len(err) > 1:
                 fe = safe_first_element(err)
-                if (len(err) != len(data)
-                        or isinstance(fe, Sized) and len(fe) > 1):
+                if (len(err) != len(data) or np.size(fe) > 1):
                     raise ValueError("err must be [ scalar | N, Nx1 "
                                      "or 2xN array-like ]")
             # using list comps rather than arrays to preserve units
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -2311,7 +2311,7 @@ def safe_first_element(obj):
             pass
         raise RuntimeError("matplotlib does not support generators "
                            "as input")
-    return next(filter(lambda e: not np.ma.is_masked(e), iter(obj)))
+    return next(iter(obj))
 
 
 def sanitize_sequence(data):
