fix kwarg positions and start_point array conversion

Cadair · Cadair · commit c35d39189e37 · 2015-07-16T15:05:14.000+01:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -4342,7 +4342,7 @@ def stackplot(self, x, *args, **kwargs):
 
     def streamplot(self, x, y, u, v, density=1, linewidth=None, color=None,
                    cmap=None, norm=None, arrowsize=1, arrowstyle='-|>',
-                   minlength=0.1, start_points=None, transform=None, zorder=1):
+                   minlength=0.1, transform=None, zorder=1, start_points=None):
         if not self._hold:
             self.cla()
         stream_container = mstream.streamplot(self, x, y, u, v,
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -3338,7 +3338,7 @@ def step(x, y, *args, **kwargs):
 @_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,
-               start_points=None, transform=None, zorder=1, hold=None):
+               transform=None, zorder=1, start_points=None, hold=None):
     ax = gca()
     # allow callers to override the hold state by passing hold=True|False
     washold = ax.ishold()
@@ -3349,8 +3349,8 @@ 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, start_points=start_points,
-                            transform=transform, zorder=zorder)
+                            minlength=minlength, transform=transform,
+                            zorder=zorder, start_points=start_points)
     finally:
         ax.hold(washold)
     sci(ret.lines)
diff --git a/lib/matplotlib/streamplot.py b/lib/matplotlib/streamplot.py
@@ -21,7 +21,7 @@
 
 def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
                cmap=None, norm=None, arrowsize=1, arrowstyle='-|>',
-               minlength=0.1, start_points=None, transform=None, zorder=1):
+               minlength=0.1, transform=None, zorder=1, start_points=None):
     """Draws streamlines of a vector flow.
 
     *x*, *y* : 1d arrays
@@ -135,7 +135,7 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
         # Convert start_points from data to array coords
         # Shift the seed points from the bottom left of the data so that
         # data2grid works properly.
-        sp2 = start_points.copy()
+        sp2 = np.asanyarray(start_points, copy=True)
         sp2[:,0] += np.abs(x[0])
         sp2[:,1] += np.abs(y[0])
         for xs, ys in sp2:
