matplotlib
diff --git a/‎lib/matplotlib/axes/_base.py
Copy file name to clipboardExpand all lines: lib/matplotlib/axes/_base.py
+3-7Lines changed: 3 additions & 7 deletions b/‎lib/matplotlib/axes/_base.py
Copy file name to clipboardExpand all lines: lib/matplotlib/axes/_base.py
+3-7Lines changed: 3 additions & 7 deletions
diff --git a/‎lib/matplotlib/lines.py
Copy file name to clipboardExpand all lines: lib/matplotlib/lines.py
+1-1Lines changed: 1 addition & 1 deletion b/‎lib/matplotlib/lines.py
Copy file name to clipboardExpand all lines: lib/matplotlib/lines.py
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/matplotlib/tests/test_axes.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_axes.py
+15-2Lines changed: 15 additions & 2 deletions b/‎lib/matplotlib/tests/test_axes.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_axes.py
+15-2Lines changed: 15 additions & 2 deletions
@@ -184,10 +184,6 @@ def __call__(self, *args, **kwargs):
         ret = self._grab_next_args(*args, **kwargs)
         return ret
 
-    def set_lineprops(self, line, **kwargs):
-        assert self.command == 'plot', 'set_lineprops only works with "plot"'
-        line.set(**kwargs)
-
     def set_patchprops(self, fill_poly, **kwargs):
         assert self.command == 'fill', 'set_patchprops only works with "fill"'
         fill_poly.set(**kwargs)
@@ -275,10 +271,10 @@ def _setdefaults(self, defaults, *kwargs):
     def _makeline(self, x, y, kw, kwargs):
         kw = kw.copy()  # Don't modify the original kw.
         kwargs = kwargs.copy()
-        default_dict = self._getdefaults(None, kw, kwargs)
-        self._setdefaults(default_dict, kw, kwargs)
+        kw.update(kwargs)
+        default_dict = self._getdefaults(None, kw)
+        self._setdefaults(default_dict, kw)
         seg = mlines.Line2D(x, y, **kw)
-        self.set_lineprops(seg, **kwargs)
         return seg
 
     def _makefill(self, x, y, kw, kwargs):
 
@@ -332,8 +332,8 @@ def __init__(self, xdata, ydata,
 
         self._dashSeq = None
 
-        self.set_linestyle(linestyle)
         self.set_drawstyle(drawstyle)
+        self.set_linestyle(linestyle)
         self.set_linewidth(linewidth)
 
         self._color = None
 
@@ -1790,11 +1790,11 @@ def test_boxplot_sym():
 def test_boxplot_autorange_whiskers():
     x = np.ones(140)
     x = np.hstack([0, x, 2])
-    
+
     fig1, ax1 = plt.subplots()
     ax1.boxplot([x, x], bootstrap=10000, notch=1)
     ax1.set_ylim((-5, 5))
-    
+
     fig2, ax2 = plt.subplots()
     ax2.boxplot([x, x], bootstrap=10000, notch=1, autorange=True)
     ax2.set_ylim((-5, 5))
@@ -4237,6 +4237,19 @@ def test_axis_set_tick_params_labelsize_labelcolor():
     assert axis_1.yaxis.majorTicks[0]._labelcolor == 'red'
 
 
+@cleanup
+def test_none_kwargs():
+    fig, ax = plt.subplots()
+    ln, = ax.plot(range(32), linestyle=None)
+    assert ln.get_linestyle() == '-'
+
+
+@cleanup
+def test_ls_ds_conflict():
+    assert_raises(ValueError, plt.plot, range(32),
+                  linestyle='steps-pre:', drawstyle='steps-post')
+
+
 @image_comparison(baseline_images=['date_timezone_x'], extensions=['png'])
 def test_date_timezone_x():
     # Tests issue 5575