Merge pull request #13992 from jklymak/fix-undeprecate-MaxNLocator-default_params

dstansby · web-flow · commit 44d503e8b439 · 2019-04-21T15:28:37.000+01:00
FIX: undeprecate MaxNLocator default_params
diff --git a/doc/api/prev_api_changes/api_changes_3.1.0.rst b/doc/api/prev_api_changes/api_changes_3.1.0.rst
@@ -938,10 +938,6 @@ classes, whose constructors take a *base* argument.
 Locators / Formatters
 ~~~~~~~~~~~~~~~~~~~~~
 
-- `matplotlib.ticker.MaxNLocator.default_params` class variable
-
-The defaults are not supposed to be user-configurable.
-
 - ``OldScalarFormatter.pprint_val``
 - ``ScalarFormatter.pprint_val``
 - ``LogFormatter.pprint_val``
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -1883,12 +1883,12 @@ class MaxNLocator(Locator):
     """
     Select no more than N intervals at nice locations.
     """
-    _default_params = dict(nbins=10,
-                           steps=None,
-                           integer=False,
-                           symmetric=False,
-                           prune=None,
-                           min_n_ticks=2)
+    default_params = dict(nbins=10,
+                          steps=None,
+                          integer=False,
+                          symmetric=False,
+                          prune=None,
+                          min_n_ticks=2)
 
     def __init__(self, *args, **kwargs):
         """
@@ -1940,7 +1940,7 @@ def __init__(self, *args, **kwargs):
             if len(args) > 1:
                 raise ValueError(
                     "Keywords are required for all arguments except 'nbins'")
-        self.set_params(**{**self._default_params, **kwargs})
+        self.set_params(**{**self.default_params, **kwargs})
 
     @staticmethod
     def _validate_steps(steps):
@@ -1957,16 +1957,6 @@ def _validate_steps(steps):
             steps = np.hstack((steps, 10))
         return steps
 
-    @cbook.deprecated("3.1")
-    @property
-    def default_params(self):
-        return self._default_params
-
-    @cbook.deprecated("3.1")
-    @default_params.setter
-    def default_params(self, params):
-        self._default_params = params
-
     @staticmethod
     def _staircase(steps):
         # Make an extended staircase within which the needed
