Expire deprecation of passing nbins to MaxNLocator in two ways

timhoffm · timhoffm · commit 12a3bd5f2317 · 2021-07-03T22:12:22.000+02:00
diff --git a/doc/api/next_api_changes/removals/20563-TH.rst b/doc/api/next_api_changes/removals/20563-TH.rst
@@ -0,0 +1,4 @@
+MaxNLocator passing *nbins* in two ways
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+`~.ticker.MaxNLocator` does not accept a positional parameter and the keyword
+argument *nbins* simultaneously because they specify the same quantity.
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -1987,7 +1987,7 @@ class MaxNLocator(Locator):
                           prune=None,
                           min_n_ticks=2)
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, nbins=None, **kwargs):
         """
         Parameters
         ----------
@@ -2024,17 +2024,8 @@ def __init__(self, *args, **kwargs):
             Relax *nbins* and *integer* constraints if necessary to obtain
             this minimum number of ticks.
         """
-        if args:
-            if 'nbins' in kwargs:
-                _api.deprecated("3.1",
-                                message='Calling MaxNLocator with positional '
-                                        'and keyword parameter *nbins* is '
-                                        'considered an error and will fail '
-                                        'in future versions of matplotlib.')
-            kwargs['nbins'] = args[0]
-            if len(args) > 1:
-                raise ValueError(
-                    "Keywords are required for all arguments except 'nbins'")
+        if nbins is not None:
+            kwargs['nbins'] = nbins
         self.set_params(**{**self.default_params, **kwargs})
 
     @staticmethod
