Be more conservative about changes

Zac-HD · Zac-HD · commit 2269e222b97d · 2018-05-02T00:21:50.000+10:00
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -793,7 +793,7 @@ class ContourSet(cm.ScalarMappable, ContourLabeler):
 
     def __init__(self, ax, *args,
                  levels=None, filled=False, linewidths=None, linestyles=None,
-                 hatches=(None,), alpha=None, origin=None, extent=None,
+                 alpha=None, origin=None, extent=None,
                  cmap=None, colors=None, norm=None, vmin=None, vmax=None,
                  extend='neither', antialiased=False,
                  **kwargs):
@@ -846,7 +846,7 @@ def __init__(self, ax, *args,
         self.filled = filled
         self.linewidths = linewidths
         self.linestyles = linestyles
-        self.hatches = hatches
+        self.hatches = kwargs.pop('hatches', [None])
         self.alpha = alpha
         self.origin = origin
         self.extent = extent
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -1572,8 +1572,8 @@ def plot(self, xs, ys, *args, zdir='z', **kwargs):
 
     plot3D = plot
 
-    def plot_surface(self, X, Y, Z, *args, cmap=None, norm=None, vmin=None,
-                     vmax=None, linewidth=None, lightsource=None, **kwargs):
+    def plot_surface(self, X, Y, Z, *args, norm=None, vmin=None,
+                     vmax=None, lightsource=None, **kwargs):
         """
         Create a surface plot.
 
@@ -1671,6 +1671,7 @@ def plot_surface(self, X, Y, Z, *args, cmap=None, norm=None, vmin=None,
             color = np.array(mcolors.to_rgba(color))
             fcolors = None
 
+        cmap = kwargs.get('cmap', None)
         shade = kwargs.pop('shade', cmap is None)
 
         # Shade the data
@@ -1726,7 +1727,7 @@ def plot_surface(self, X, Y, Z, *args, cmap=None, norm=None, vmin=None,
         else :
             normals = []
 
-        polyc = art3d.Poly3DCollection(polys, *args, cmap=cmap, **kwargs)
+        polyc = art3d.Poly3DCollection(polys, *args, **kwargs)
 
         if fcolors is not None:
             if shade:
@@ -1917,9 +1918,8 @@ def plot_wireframe(self, X, Y, Z, *args, **kwargs):
 
         return linec
 
-    def plot_trisurf(self, *args, color=None, cmap=None, norm=None, vmin=None,
-                     vmax=None, linewidth=None, shade=None, lightsource=None,
-                     **kwargs):
+    def plot_trisurf(self, *args, color=None, norm=None, vmin=None, vmax=None,
+                     lightsource=None, **kwargs):
         """
         ============= ================================================
         Argument      Description
@@ -1975,11 +1975,10 @@ def plot_trisurf(self, *args, color=None, cmap=None, norm=None, vmin=None,
             color = self._get_lines.get_next_color()
         color = np.array(mcolors.to_rgba(color))
 
-        if shade is None:
-            shade = cmap is None
+        cmap = kwargs.get('cmap', None)
+        shade = kwargs.pop('shade', cmap is None)
 
-        tri, args, kwargs = Triangulation.get_from_args_and_kwargs(
-            *args, cmap=cmap, **kwargs)
+        tri, args, kwargs = Triangulation.get_from_args_and_kwargs(*args, **kwargs)
         if 'Z' in kwargs:
             z = np.asarray(kwargs.pop('Z'))
         else:
