Merge pull request #6997 from maahn/fixPandas

tacaswell · tacaswell · commit 018fa1cd7ae4 · 2016-08-29T00:09:42.000-04:00
FIX: Only try to find unit converter for first element of sequence

Conflicts:
	lib/matplotlib/units.py
	  - master branch lost six import, kept in place in backport
diff --git a/lib/matplotlib/units.py b/lib/matplotlib/units.py
@@ -47,7 +47,7 @@ def default_units(x, axis):
 
 import six
 
-from matplotlib.cbook import iterable, is_numlike
+from matplotlib.cbook import iterable, is_numlike, safe_first_element
 import numpy as np
 
 
@@ -158,14 +158,11 @@ def get_converter(self, x):
                     converter = self.get_converter(next_item)
                 return converter
 
-        if converter is None and iterable(x):
-            for thisx in x:
-                # Make sure that recursing might actually lead to a solution,
-                # if we are just going to re-examine another item of the same
-                # kind, then do not look at it.
-                if classx and classx != getattr(thisx, '__class__', None):
-                    converter = self.get_converter(thisx)
-                    return converter
+        if converter is None and iterable(x) and (len(x) > 0):
+            thisx = safe_first_element(x)
+            if classx and classx != getattr(thisx, '__class__', None):
+                converter = self.get_converter(thisx)
+                return converter
 
         #DISABLED self._cached[idx] = converter
         return converter
