Deprecate MAXTICKS, Locator.raise_if_exceeds.

anntzer · anntzer · commit 565d83f848a3 · 2017-03-27T22:19:17.000-07:00
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -822,7 +822,7 @@ def tick_values(self, vmin, vmax):
         dates = self.rule.between(vmin, vmax, True)
         if len(dates) == 0:
             return date2num([vmin, vmax])
-        return self.raise_if_exceeds(date2num(dates))
+        return date2num(dates)
 
     def _get_unit(self):
         """
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
@@ -88,23 +88,6 @@ def test_date_axvline():
     fig.autofmt_xdate()
 
 
-def test_too_many_date_ticks():
-    # Attempt to test SF 2715172, see
-    # https://sourceforge.net/tracker/?func=detail&aid=2715172&group_id=80706&atid=560720
-    # setting equal datetimes triggers and expander call in
-    # transforms.nonsingular which results in too many ticks in the
-    # DayLocator.  This should trigger a Locator.MAXTICKS RuntimeError
-    t0 = datetime.datetime(2000, 1, 20)
-    tf = datetime.datetime(2000, 1, 20)
-    fig = plt.figure()
-    ax = fig.add_subplot(1, 1, 1)
-    ax.set_xlim((t0, tf), auto=True)
-    ax.plot([], [])
-    ax.xaxis.set_major_locator(mdates.DayLocator())
-    with pytest.raises(RuntimeError):
-        fig.savefig('junk.png')
-
-
 @image_comparison(baseline_images=['RRuleLocator_bounds'], extensions=['png'])
 def test_RRuleLocator():
     import matplotlib.testing.jpl_units as units
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -1387,7 +1387,10 @@ class Locator(TickHelper):
     # kill the machine when you try and render them.
     # This parameter is set to cause locators to raise an error if too
     # many ticks are generated.
-    MAXTICKS = 1000
+    @property
+    @cbook.deprecated("2.1")
+    def MAXTICKS(self):
+        return 1000
 
     def tick_values(self, vmin, vmax):
         """
@@ -1420,6 +1423,7 @@ def __call__(self):
         # hence there is no *one* interface to call self.tick_values.
         raise NotImplementedError('Derived must override')
 
+    @cbook.deprecated("2.1")
     def raise_if_exceeds(self, locs):
         """raise a RuntimeError if Locator attempts to create more than
            MAXTICKS locs"""
@@ -1546,7 +1550,7 @@ def tick_values(self, vmin, vmax):
             ticks1 = self.locs[i::step]
             if np.abs(ticks1).min() < np.abs(ticks).min():
                 ticks = ticks1
-        return self.raise_if_exceeds(ticks)
+        return ticks
 
 
 class NullLocator(Locator):
@@ -1605,18 +1609,14 @@ def tick_values(self, vmin, vmax):
         vmin, vmax = mtransforms.nonsingular(vmin, vmax, expander=0.05)
         if vmax < vmin:
             vmin, vmax = vmax, vmin
-
         if (vmin, vmax) in self.presets:
             return self.presets[(vmin, vmax)]
-
         if self.numticks is None:
             self._set_numticks()
-
         if self.numticks == 0:
             return []
         ticklocs = np.linspace(vmin, vmax, self.numticks)
-
-        return self.raise_if_exceeds(ticklocs)
+        return ticklocs
 
     def _set_numticks(self):
         self.numticks = 11  # todo; be smart here; this is just for dev
@@ -1716,7 +1716,7 @@ def tick_values(self, vmin, vmax):
         base = self._base.get_base()
         n = (vmax - vmin + 0.001 * base) // base
         locs = vmin - base + np.arange(n + 3) * base
-        return self.raise_if_exceeds(locs)
+        return locs
 
     def view_limits(self, dmin, dmax):
         """
@@ -1931,7 +1931,7 @@ def tick_values(self, vmin, vmax):
             locs = locs[:-1]
         elif prune == 'both':
             locs = locs[1:-1]
-        return self.raise_if_exceeds(locs)
+        return locs
 
     def view_limits(self, dmin, dmax):
         if self._symmetric:
@@ -2133,7 +2133,7 @@ def tick_values(self, vmin, vmax):
             else:
                 ticklocs = b ** decades
 
-        return self.raise_if_exceeds(np.asarray(ticklocs))
+        return np.asarray(ticklocs)
 
     def view_limits(self, vmin, vmax):
         'Try to choose the view limits intelligently'
@@ -2314,7 +2314,7 @@ def get_log_range(lo, hi):
         else:
             ticklocs = decades
 
-        return self.raise_if_exceeds(np.array(ticklocs))
+        return np.array(ticklocs)
 
     def view_limits(self, vmin, vmax):
         'Try to choose the view limits intelligently'
@@ -2405,7 +2405,7 @@ def tick_values(self, vmin, vmax):
                 newticks = 1 - np.outer(np.arange(2, 10), 10**expo).ravel()
                 ticklocs.extend(list(newticks))
 
-        return self.raise_if_exceeds(np.array(ticklocs))
+        return np.array(ticklocs)
 
     def nonsingular(self, vmin, vmax):
         initial_range = (1e-7, 1 - 1e-7)
@@ -2510,7 +2510,7 @@ def __call__(self):
         else:
             locs = []
 
-        return self.raise_if_exceeds(np.array(locs))
+        return np.array(locs)
 
     def tick_values(self, vmin, vmax):
         raise NotImplementedError('Cannot get tick locations for a '
@@ -2529,7 +2529,7 @@ def __init__(self):
     def __call__(self):
         'Return the locations of the ticks'
         self.refresh()
-        return self.raise_if_exceeds(self._locator())
+        return self._locator()
 
     def tick_values(self, vmin, vmax):
         raise NotImplementedError('Cannot get tick locations for a '
