conserve kwargs order.

Manuel Jung · Manuel Jung · commit ea3ac03076d6 · 2016-03-14T21:51:24.000+01:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -4465,8 +4465,9 @@ def stackplot(self, x, *args, **kwargs):
                          label_namer=None)
     def streamplot(self, x, y, u, v, density=1, linewidth=None, color=None,
                    cmap=None, norm=None, arrowsize=1, arrowstyle='-|>',
-                   minlength=0.1, maxlength=4.0, transform=None, zorder=2,
-                   start_points=None, integration_direction='both'):
+                   minlength=0.1, transform=None, zorder=2,
+                   start_points=None, maxlength=4.0,
+                   integration_direction='both'):
         if not self._hold:
             self.cla()
         stream_container = mstream.streamplot(
@@ -4479,11 +4480,11 @@ def streamplot(self, x, y, u, v, density=1, linewidth=None, color=None,
             arrowsize=arrowsize,
             arrowstyle=arrowstyle,
             minlength=minlength,
-            maxlength=maxlength,
             start_points=start_points,
             transform=transform,
-            integration_direction=integration_direction,
-            zorder=zorder)
+            zorder=zorder,
+            maxlength=maxlength,
+            integration_direction=integration_direction)
         return stream_container
     streamplot.__doc__ = mstream.streamplot.__doc__
 
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -2840,7 +2840,7 @@ def hexbin(x, y, C=None, gridsize=100, bins=None, xscale='linear',
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost
 @_autogen_docstring(Axes.hist)
-def hist(x, bins=10, range=None, normed=False, weights=None, cumulative=False,
+def hist(x, bins=None, range=None, normed=False, weights=None, cumulative=False,
          bottom=None, histtype='bar', align='mid', orientation='vertical',
          rwidth=None, log=False, color=None, label=None, stacked=False,
          hold=None, data=None, **kwargs):
@@ -3267,9 +3267,9 @@ def step(x, y, *args, **kwargs):
 # changes will be lost
 @_autogen_docstring(Axes.streamplot)
 def streamplot(x, y, u, v, density=1, linewidth=None, color=None, cmap=None,
-               norm=None, arrowsize=1, arrowstyle='-|>', minlength=0.1, maxlength=4.0,
-               transform=None, zorder=2, start_points=None, hold=None, data=None,
-               integration_direction='both'):
+               norm=None, arrowsize=1, arrowstyle='-|>', minlength=0.1,
+               maxlength=4.0, transform=None, zorder=2, start_points=None,
+               integration_direction='both', hold=None, data=None):
     ax = gca()
     # allow callers to override the hold state by passing hold=True|False
     washold = ax.ishold()
@@ -3280,10 +3280,11 @@ def streamplot(x, y, u, v, density=1, linewidth=None, color=None, cmap=None,
         ret = ax.streamplot(x, y, u, v, density=density, linewidth=linewidth,
                             color=color, cmap=cmap, norm=norm,
                             arrowsize=arrowsize, arrowstyle=arrowstyle,
-                            minlength=minlength, transform=transform,
-                            zorder=zorder, start_points=start_points,
-                            data=data, maxlength=maxlength,
-                            integration_direction=integration_direction)
+                            minlength=minlength, maxlength=maxlength,
+                            transform=transform, zorder=zorder,
+                            start_points=start_points,
+                            integration_direction=integration_direction,
+                            data=data)
     finally:
         ax.hold(washold)
     sci(ret.lines)
diff --git a/lib/matplotlib/streamplot.py b/lib/matplotlib/streamplot.py
@@ -21,8 +21,8 @@
 
 def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
                cmap=None, norm=None, arrowsize=1, arrowstyle='-|>',
-               minlength=0.1, maxlength=4.0, transform=None, zorder=2,
-               start_points=None, integration_direction='both'):
+               minlength=0.1, transform=None, zorder=2, start_points=None,
+               maxlength=4.0, integration_direction='both'):
     """Draws streamlines of a vector flow.
 
     *x*, *y* : 1d arrays
@@ -97,8 +97,8 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
     arrow_kw = dict(arrowstyle=arrowstyle, mutation_scale=10 * arrowsize)
 
     if integration_direction not in ['both', 'forward', 'backward']:
-        errstr = "Integration direction " \
-                 "'%s' not recognised." % integration_direction
+        errstr = ("Integration direction '%s' not recognised." %
+          integration_direction)
         errstr += "Expected 'both', 'forward' or 'backward'."
         raise ValueError(errstr)
 
