revert explicit keyword arguments in Axes.stem

timhoffm · timhoffm · commit 5d447288c33a · 2018-01-04T05:42:41.000+01:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -2391,19 +2391,22 @@ def broken_barh(self, xranges, yrange, **kwargs):
         return col
 
     @_preprocess_data(replace_all_args=True, label_namer=None)
-    def stem(self, *args, linefmt=None, markerfmt=None, basefmt=None, bottom=0,
-             label=None, **kwargs):
+    def stem(self, *args, **kwargs):
         """
         Create a stem plot.
 
-        Call signatures::
-
-          stem(y)
-          stem(x, y)
-
         A stem plot plots vertical lines at each *x* location from the baseline
         to *y*, and places a marker there.
 
+        Call signatures::
+
+          stem([x,] y, **kwargs)
+          stem([x,] y, linefmt, **kwargs)
+          stem([x,] y, linefmt, markerfmt, **kwargs)
+          stem([x,] y, linefmt, markerfmt, basefmt, **kwargs)
+
+        The x-positions are optional. The formats may be provided either as
+        positional or as keyword-arguments.
 
         Parameters
         ----------
@@ -2474,9 +2477,21 @@ def stem(self, *args, linefmt=None, markerfmt=None, basefmt=None, bottom=0,
             which inspired this method.
 
         """
+
+        # kwargs handling
+        # We would like to have a signature with explicit kewords:
+        # stem(*args, linefmt=None, markerfmt=None, basefmt=None,
+        #      bottom=0, label=None)
+        # Unfortunately,  this is not supported in Python 2.x. There, *args
+        # can only exist after keyword arguments.
+        linefmt = kwargs.pop('linefmt', None)
+        markerfmt = kwargs.pop('markerfmt', None)
+        basefmt = kwargs.pop('basefmt', None)
+        bottom = kwargs.pop('bottom', None)
+        if bottom is None:
+            bottom = 0
+        label = kwargs.pop('label', None)
         if kwargs:
-            # TODO: to remove the deprecated behavior, simply remove **kwargs
-            #       from the function signature and remove this warning.
             warn_deprecated(since='2.2',
                             message = "stem() got an unexpected keyword "
                                       "argument '%s'. This will raise a "
@@ -2503,7 +2518,7 @@ def stem(self, *args, linefmt=None, markerfmt=None, basefmt=None, bottom=0,
             second = np.arange(len(y))
             x = second
 
-        # Popping some defaults
+        # defaults for formats
         if linefmt is None:
             try:
                 # fallback to positional argument
@@ -2550,8 +2565,6 @@ def stem(self, *args, linefmt=None, markerfmt=None, basefmt=None, bottom=0,
         else:
             basestyle, basemarker, basecolor = _process_plot_format(basefmt)
 
-        if bottom is None:
-            bottom = 0
 
         markerline, = self.plot(x, y, color=markercolor, linestyle=markerstyle,
                                 marker=markermarker, label="_nolegend_")
