Revision changes

Manuel Jung · Manuel Jung · commit c01484680925 · 2016-11-21T08:18:29.000+01:00
diff --git a/doc/users/whats_new/streamplot_set_maximum_length.rst b/doc/users/whats_new/streamplot_set_maximum_length.rst
@@ -1,4 +1,5 @@
 Maximum streamline length and integration direction can now be specified
 ------------------------------------------------------------------------
 
-This allows to follow the vector field for a longer time and can enhance the visibilty of the flow pattern in some use cases.
+This allows to follow the vector field for a longer time and can enhance the
+visibility of the flow pattern in some use cases.
diff --git a/lib/matplotlib/streamplot.py b/lib/matplotlib/streamplot.py
@@ -61,7 +61,7 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
         any number
     *maxlength* : float
         Maximum length of streamline in axes coordinates.
-    *integration_direction* : ['foward','backward','both']
+    *integration_direction* : ['forward', 'backward', 'both']
         Integrate the streamline in forward, backward or both directions.
 
     Returns:
@@ -101,9 +101,9 @@ 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 += "Expected 'both', 'forward' or 'backward'."
+        errstr = ("Integration direction '%s' not recognised."
+                  "Expected 'both', 'forward' or 'backward'." %
+                  integration_direction)
         raise ValueError(errstr)
 
     if integration_direction == 'both':
@@ -466,8 +466,8 @@ def integrate(x0, y0):
             dmap.reset_start_point(x0, y0)
             s, xt, yt = _integrate_rk12(x0, y0, dmap, forward_time, maxlength)
             if len(x_traj) > 0:
-              xt = xt[1:]
-              yt = yt[1:]
+                xt = xt[1:]
+                yt = yt[1:]
             stotal += s
             x_traj += xt
             y_traj += yt
diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
@@ -17,9 +17,9 @@ def velocity_field():
     return X, Y, U, V
 
 def swirl_velocity_field():
-    x = np.linspace(-3.,3.,100)
-    y = np.linspace(-3.,3.,100)
-    X,Y = np.meshgrid(x,y)
+    x = np.linspace(-3., 3., 100)
+    y = np.linspace(-3., 3., 100)
+    X, Y = np.meshgrid(x, y)
     a = 0.1
     U = np.cos(a) * (-Y) - np.sin(a) * X
     V = np.sin(a) * (-Y) + np.cos(a) * X
@@ -69,16 +69,16 @@ def test_masks_and_nans():
                   extensions=['png'])
 def test_maxlength():
     x, y, U, V = swirl_velocity_field()
-    plt.streamplot(x, y, U, V, maxlength=10., start_points=[[0.,1.5]],
-                   linewidth=2,density=2)
+    plt.streamplot(x, y, U, V, maxlength=10., start_points=[[0., 1.5]],
+                   linewidth=2, density=2)
 
 
 @image_comparison(baseline_images=['streamplot_direction'],
                   extensions=['png'])
 def test_direction():
     x, y, U, V = swirl_velocity_field()
     plt.streamplot(x, y, U, V, integration_direction='backward',
-                   maxlength=1.5, start_points=[[1.5,0.]],
+                   maxlength=1.5, start_points=[[1.5, 0.]],
                    linewidth=2, density=2)
 
 
