Merge pull request #2290 from selasley/master

mdboom · mdboom · commit 3b20ed17c93f · 2013-08-12T13:18:56.000-04:00
Fix a recursion problem with masked arrays in get_converter
Conflicts:
	lib/matplotlib/units.py
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -583,6 +583,8 @@ def test_fill_between_interpolate():
 
     # Test support for masked arrays.
     y2 = np.ma.masked_greater(y2, 1.0)
+    # Test that plotting works for masked arrays with the first element masked
+    y2[0] = np.ma.masked
     ax1 = fig.add_subplot(212, sharex=ax)
     ax1.plot(x, y1, x, y2, color='black')
     ax1.fill_between(x, y1, y2, where=y2>=y1, facecolor='green', interpolate=True)
diff --git a/lib/matplotlib/units.py b/lib/matplotlib/units.py
@@ -44,6 +44,7 @@ def default_units(x, axis):
 """
 from __future__ import print_function
 from matplotlib.cbook import iterable, is_numlike
+import numpy as np
 
 
 class AxisInfo:
@@ -132,6 +133,21 @@ def get_converter(self, x):
         if classx is not None:
             converter = self.get(classx)
 
+        if isinstance(x, np.ndarray) and x.size:
+            xravel = x.ravel()
+            try:
+                # pass the first value of x that is not masked back to
+                # get_converter
+                if not np.all(xravel.mask):
+                    # some elements are not masked
+                    converter = self.get_converter(
+                        xravel[np.argmin(xravel.mask)])
+                    return converter
+            except AttributeError:
+                # not a masked_array
+                converter = self.get_converter(xravel[0])
+                return converter
+
         if converter is None and iterable(x):
             for thisx in x:
                 # Make sure that recursing might actually lead to a solution,
