Merge pull request #6156 from madphysicist/patch-1

tacaswell · tacaswell · commit 196f3446a3d5 · 2016-03-14T15:41:10.000-04:00
Bug: Fixed regression of `drawstyle=None`
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -985,6 +985,8 @@ def set_drawstyle(self, drawstyle):
         ACCEPTS: ['default' | 'steps' | 'steps-pre' | 'steps-mid' |
                   'steps-post']
         """
+        if drawstyle is None:
+            drawstyle = 'default'
         if drawstyle not in self.drawStyles:
             raise ValueError('Unrecognized drawstyle ' +
                              ' '.join(self.drawStyleKeys))
diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
@@ -123,7 +123,7 @@ def test_drawstyle_variants():
     fig = plt.figure()
     ax = fig.add_subplot(1, 1, 1)
     for ds in ("default", "steps-mid", "steps-pre", "steps-post",
-               "steps"):
+               "steps", None):
         ax.plot(range(10), drawstyle=ds)
 
     fig.canvas.draw()
