manage locators not deriving from LocatorBase

zblz · zblz · commit 19a06a349c0b · 2015-10-09T15:49:09.000+01:00
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -890,14 +890,20 @@ def iter_ticks(self):
         Iterate through all of the major and minor ticks.
         """
         majorLocs = self.major.locator()
-        hasLabel = self.major.locator.show_tick_label(majorLocs)
+        try:
+            hasLabel = self.major.locator.show_tick_label(majorLocs)
+        except AttributeError:
+            hasLabel = np.ones(np.asarray(majorLocs).size, dtype=np.bool)
         majorTicks = self.get_major_ticks(len(majorLocs))
         self.major.formatter.set_locs(majorLocs)
         majorLabels = [self.major.formatter(val, i) if hasLabel[i] else ''
                        for i, val in enumerate(majorLocs)]
 
         minorLocs = self.minor.locator()
-        hasLabel = self.major.locator.show_tick_label(minorLocs)
+        try:
+            hasLabel = self.major.locator.show_tick_label(minorLocs)
+        except AttributeError:
+            hasLabel = np.ones(np.asarray(minorLocs).size, dtype=np.bool)
         minorTicks = self.get_minor_ticks(len(minorLocs))
         self.minor.formatter.set_locs(minorLocs)
         minorLabels = [self.minor.formatter(val, i) if hasLabel[i] else ''
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -1625,7 +1625,7 @@ def show_tick_label(self, ticklocs):
         numdec = abs(vmax - vmin)
 
         if numdec > 3:
-            sublabel = set((1))
+            sublabel = set((1,))
         elif numdec > 2:
             sublabel = set((1, 3))
         elif numdec > 1:
