Merge pull request #1802 from tacaswell/step_linestyle

Step linestyle
matplotlib · Mar 23, 2013 · a844fbb · a844fbb
2 parents b79b55d + fec0f63
commit a844fbb
Show file tree

Hide file tree

Showing 6 changed files with 1,229 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2013-03-19 Added support for passing `linestyle` kwarg to `step` so all `plot`
+	   kwargs are passed to the underlying `plot` call.  -TAC
+
 2013-02-25 Added classes CubicTriInterpolator, UniformTriRefiner, TriAnalyzer
            to matplotlib.tri module. - GBy
 

diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -4809,7 +4809,8 @@ def step(self, x, y, *args, **kwargs):
         if where not in ('pre', 'post', 'mid'):
             raise ValueError("'where' argument to step must be "
                              "'pre', 'post' or 'mid'")
-        kwargs['linestyle'] = 'steps-' + where
+        usr_linestyle = kwargs.pop('linestyle', '')
+        kwargs['linestyle'] = 'steps-' + where + usr_linestyle
 
         return self.plot(x, y, *args, **kwargs)
 

diff --git a/lib/matplotlib/tests/baseline_images/test_axes/step_linestyle.pdf b/lib/matplotlib/tests/baseline_images/test_axes/step_linestyle.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/step_linestyle.png b/lib/matplotlib/tests/baseline_images/test_axes/step_linestyle.png