Merge remote-tracking branch 'matplotlib/v2.x'

Conflicts:
	lib/matplotlib/backends/qt_editor/figureoptions.py
	  - pep8 conflicts

Author: tacaswell

lib/matplotlib/axes/_axes.py

@@ -3854,6 +3854,10 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
                 edgecolors = co
             if facecolors is None:
                 facecolors = co
+            if c is not None:
+                raise ValueError("Supply a 'c' kwarg or a 'color' kwarg"
+                                 " but not both; they differ but"
+                                 " their functionalities overlap.")
         if c is None:
             if facecolors is not None:
                 c = facecolors
@@ -3862,6 +3866,9 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
                     c = 'b'  # The original default
                 else:
                     c = self._get_patches_for_fill.get_next_color()
+            c_none = True
+        else:
+            c_none = False
 
         if edgecolors is None and not rcParams['_internal.classic_mode']:
             edgecolors = 'face'
@@ -3889,16 +3896,19 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
         # c is an array for mapping.  The potential ambiguity
         # with a sequence of 3 or 4 numbers is resolved in
         # favor of mapping, not rgb or rgba.
-        try:
-            c_array = np.asanyarray(c, dtype=float)
-            if c_array.size == x.size:
-                c = np.ma.ravel(c_array)
-            else:
-                # Wrong size; it must not be intended for mapping.
-                c_array = None
-        except ValueError:
-            # Failed to make a floating-point array; c must be color specs.
+        if c_none or co is not None:
             c_array = None
+        else:
+            try:
+                c_array = np.asanyarray(c, dtype=float)
+                if c_array.size == x.size:
+                    c = np.ma.ravel(c_array)
+                else:
+                    # Wrong size; it must not be intended for mapping.
+                    c_array = None
+            except ValueError:
+                # Failed to make a floating-point array; c must be color specs.
+                c_array = None
 
         if c_array is None:
             colors = c     # must be acceptable as PathCollection facecolors

lib/matplotlib/axes/_base.py

@@ -297,11 +297,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):

lib/matplotlib/backends/qt_editor/figureoptions.py

@@ -175,8 +175,12 @@ def apply_callback(data):
         # Set / General
         (title, xmin, xmax, xlabel, xscale, ymin, ymax, ylabel, yscale,
          generate_legend) = general
-        axes.set_xscale(xscale)
-        axes.set_yscale(yscale)
+
+        if axes.get_xscale() != xscale:
+            axes.set_xscale(xscale)
+        if axes.get_yscale() != yscale:
+            axes.set_yscale(yscale)
+
         axes.set_title(title)
         axes.set_xlim(xmin, xmax)
         axes.set_xlabel(xlabel)

lib/matplotlib/lines.py

@@ -333,6 +333,18 @@ def __init__(self, xdata, ydata,
         if solid_joinstyle is None:
             solid_joinstyle = rcParams['lines.solid_joinstyle']
 
+        if is_string_like(linestyle):
+            ds, ls = self._split_drawstyle_linestyle(linestyle)
+            if ds is not None and drawstyle is not None and ds != drawstyle:
+                raise ValueError("Inconsistent drawstyle ({0!r}) and "
+                                 "linestyle ({1!r})".format(drawstyle,
+                                                            linestyle)
+                                 )
+            linestyle = ls
+
+            if ds is not None:
+                drawstyle = ds
+
         if drawstyle is None:
             drawstyle = 'default'
 
@@ -1004,6 +1016,38 @@ def set_linewidth(self, w):
             self.stale = True
         self._linewidth = w
 
+    def _split_drawstyle_linestyle(self, ls):
+        '''Split drawstyle from linestyle string
+
+        If `ls` is only a drawstyle default to returning a linestyle
+        of '-'.
+
+        Parameters
+        ----------
+        ls : str
+            The linestyle to be processed
+
+        Returns
+        -------
+        ret_ds : str or None
+            If the linestyle string does not contain a drawstyle prefix
+            return None, otherwise return it.
+
+        ls : str
+            The linestyle with the drawstyle (if any) stripped.
+        '''
+        ret_ds = None
+        for ds in self.drawStyleKeys:  # long names are first in the list
+            if ls.startswith(ds):
+                ret_ds = ds
+                if len(ls) > len(ds):
+                    ls = ls[len(ds):]
+                else:
+                    ls = '-'
+                break
+
+        return ret_ds, ls
+
     def set_linestyle(self, ls):
         """
         Set the linestyle of the line (also accepts drawstyles,
@@ -1056,15 +1100,9 @@ def set_linestyle(self, ls):
             self._dashOffset = ls[0]
             self._linestyle = "--"
             return
-
-        for ds in self.drawStyleKeys:  # long names are first in the list
-            if ls.startswith(ds):
-                self.set_drawstyle(ds)
-                if len(ls) > len(ds):
-                    ls = ls[len(ds):]
-                else:
-                    ls = '-'
-                break
+        ds, ls = self._split_drawstyle_linestyle(ls)
+        if ds is not None:
+            self.set_drawstyle(ds)
 
         if ls in [' ', '', 'none']:
             ls = 'None'

lib/matplotlib/tests/test_axes.py

@@ -4386,6 +4386,25 @@ 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')
+
+
+@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
@@ -4458,6 +4477,13 @@ def test_axisbelow():
         ax.set_axisbelow(setting)
 
 
+@cleanup
+def test_large_offset():
+    fig, ax = plt.subplots()
+    ax.plot((1 + np.array([0, 1.e-12])) * 1.e27)
+    fig.canvas.draw()
+
+
 if __name__ == '__main__':
     import nose
     import sys

lib/matplotlib/ticker.py

@@ -694,7 +694,7 @@ def _compute_offset(self):
         # equal up to that precision?
         # Note: Internally using oom instead of 10 ** oom avoids some numerical
         # accuracy issues.
-        oom_max = math.ceil(math.log10(abs_max))
+        oom_max = np.ceil(math.log10(abs_max))
         oom = 1 + next(oom for oom in itertools.count(oom_max, -1)
                        if abs_min // 10 ** oom != abs_max // 10 ** oom)
         if (abs_max - abs_min) / 10 ** oom <= 1e-2: