Rebase branch with upsteram

thoo · thoo · commit 969919b941a4 · 2018-10-16T16:26:11.000-04:00
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -2379,8 +2379,8 @@ def angle_spectrum(
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @docstring.copy_dedent(Axes.annotate)
-def annotate(text, xy, *args, **kwargs):
-    return gca().annotate(text, xy, *args, **kwargs)
+def annotate(*args, **kwargs):
+    return gca().annotate(*args, **kwargs)
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
@@ -2427,12 +2427,10 @@ def axvspan(xmin, xmax, ymin=0, ymax=1, **kwargs):
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @docstring.copy_dedent(Axes.bar)
-def bar(
-        x, height, width=0.8, bottom=None, *, align='center',
-        data=None, **kwargs):
+def bar(*args, data=None, **kwargs):
     return gca().bar(
-        x, height, width=width, bottom=bottom, align=align,
-        **({"data": data} if data is not None else {}), **kwargs)
+        *args, **({"data": data} if data is not None else {}),
+        **kwargs)
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
@@ -2444,9 +2442,8 @@ def barbs(*args, data=None, **kw):
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @docstring.copy_dedent(Axes.barh)
-def barh(y, width, height=0.8, left=None, *, align='center', **kwargs):
-    return gca().barh(
-        y, width, height=height, left=left, align=align, **kwargs)
+def barh(*args, **kwargs):
+    return gca().barh(*args, **kwargs)
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
@@ -2710,8 +2707,8 @@ def magnitude_spectrum(
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @docstring.copy_dedent(Axes.margins)
-def margins(*margins, x=None, y=None, tight=True):
-    return gca().margins(*margins, x=x, y=y, tight=tight)
+def margins(*args, **kw):
+    return gca().margins(*args, **kw)
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
@@ -2728,27 +2725,20 @@ def minorticks_on():
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @_autogen_docstring(Axes.pcolor)
-def pcolor(
-        *args, alpha=None, norm=None, cmap=None, vmin=None,
-        vmax=None, data=None, **kwargs):
+def pcolor(*args, data=None, **kwargs):
     __ret = gca().pcolor(
-        *args, alpha=alpha, norm=norm, cmap=cmap, vmin=vmin,
-        vmax=vmax, **({"data": data} if data is not None else {}),
+        *args, **({"data": data} if data is not None else {}),
         **kwargs)
     sci(__ret)
     return __ret
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @_autogen_docstring(Axes.pcolormesh)
-def pcolormesh(
-        *args, alpha=None, norm=None, cmap=None, vmin=None,
-        vmax=None, shading='flat', antialiased=False, data=None,
-        **kwargs):
+def pcolormesh(*args, data=None, **kwargs):
     __ret = gca().pcolormesh(
-        *args, alpha=alpha, norm=norm, cmap=cmap, vmin=vmin,
-        vmax=vmax, shading=shading, antialiased=antialiased,
-        **({"data": data} if data is not None else {}), **kwargs)
+        *args, **({"data": data} if data is not None else {}),
+        **kwargs)
     sci(__ret)
     return __ret
 
@@ -2783,10 +2773,10 @@ def pie(
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @docstring.copy_dedent(Axes.plot)
-def plot(*args, scalex=True, scaley=True, data=None, **kwargs):
+def plot(*args, data=None, **kwargs):
     return gca().plot(
-        *args, scalex=scalex, scaley=scaley, **({"data": data} if data
-        is not None else {}), **kwargs)
+        *args, **({"data": data} if data is not None else {}),
+        **kwargs)
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
@@ -2823,8 +2813,8 @@ def quiver(*args, data=None, **kw):
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @docstring.copy_dedent(Axes.quiverkey)
-def quiverkey(Q, X, Y, U, label, **kw):
-    return gca().quiverkey(Q, X, Y, U, label, **kw)
+def quiverkey(*args, **kw):
+    return gca().quiverkey(*args, **kw)
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
@@ -2893,21 +2883,18 @@ def stackplot(x, *args, data=None, **kwargs):
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @docstring.copy_dedent(Axes.stem)
-def stem(
-        *args, linefmt=None, markerfmt=None, basefmt=None, bottom=0,
-        label=None, data=None):
+def stem(*args, data=None, **kwargs):
     return gca().stem(
-        *args, linefmt=linefmt, markerfmt=markerfmt, basefmt=basefmt,
-        bottom=bottom, label=label, **({"data": data} if data is not
-        None else {}))
+        *args, **({"data": data} if data is not None else {}),
+        **kwargs)
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @docstring.copy_dedent(Axes.step)
-def step(x, y, *args, where='pre', data=None, **kwargs):
+def step(x, y, *args, data=None, **kwargs):
     return gca().step(
-        x, y, *args, where=where, **({"data": data} if data is not
-        None else {}), **kwargs)
+        x, y, *args, **({"data": data} if data is not None else {}),
+        **kwargs)
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
@@ -2949,13 +2936,8 @@ def tick_params(axis='both', **kwargs):
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @docstring.copy_dedent(Axes.ticklabel_format)
-def ticklabel_format(
-        *, axis='both', style='', scilimits=None, useOffset=None,
-        useLocale=None, useMathText=None):
-    return gca().ticklabel_format(
-        axis=axis, style=style, scilimits=scilimits,
-        useOffset=useOffset, useLocale=useLocale,
-        useMathText=useMathText)
+def ticklabel_format(**kwargs):
+    return gca().ticklabel_format(**kwargs)
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
