Merge pull request #7475 from anntzer/pcolor-shading

tacaswell · web-flow · commit d36e499fdb69 · 2016-11-21T20:03:13.000-05:00
MNT: Remove deprecated "shading" option to pcolor.
diff --git a/doc/api/api_changes/code_removal.rst b/doc/api/api_changes/code_removal.rst
@@ -25,3 +25,10 @@ removed.
 
 Support for setting an ``Axes``' aspect to ``"normal"`` has been removed, in
 favor of the synonym ``"auto"``.
+
+
+``shading`` kwarg to ``pcolor``
+-------------------------------
+
+The ``shading`` kwarg to ``pcolor`` has been removed.  Set ``edgecolors``
+appropriately instead.
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -5297,15 +5297,6 @@ def pcolor(self, *args, **kwargs):
             *vmax* passed in here override any pre-existing values
             supplied in the *norm* instance.
 
-          *shading*: [ 'flat' | 'faceted' ]
-            If 'faceted', a black grid is drawn around each rectangle; if
-            'flat', edges are not drawn. Default is 'flat', contrary to
-            MATLAB.
-
-            This kwarg is deprecated; please use 'edgecolors' instead:
-              * shading='flat' -- edgecolors='none'
-              * shading='faceted  -- edgecolors='k'
-
           *edgecolors*: [ *None* | ``'none'`` | color | color sequence]
             If *None*, the rc setting is used by default.
 
@@ -5395,11 +5386,6 @@ def pcolor(self, *args, **kwargs):
         cmap = kwargs.pop('cmap', None)
         vmin = kwargs.pop('vmin', None)
         vmax = kwargs.pop('vmax', None)
-        if 'shading' in kwargs:
-            cbook.warn_deprecated(
-                '1.2', name='shading', alternative='edgecolors',
-                obj_type='option')
-        shading = kwargs.pop('shading', 'flat')
 
         X, Y, C = self._pcolorargs('pcolor', *args, allmatch=False)
         Ny, Nx = X.shape
@@ -5449,14 +5435,9 @@ def pcolor(self, *args, **kwargs):
             kwargs['linewidths'] = kwargs.pop('linewidth')
         kwargs.setdefault('linewidths', linewidths)
 
-        if shading == 'faceted':
-            edgecolors = 'k',
-        else:
-            edgecolors = 'none'
-
         if 'edgecolor' in kwargs:
             kwargs['edgecolors'] = kwargs.pop('edgecolor')
-        ec = kwargs.setdefault('edgecolors', edgecolors)
+        ec = kwargs.setdefault('edgecolors', 'none')
 
         # aa setting will default via collections to patch.antialiased
         # unless the boundary is not stroked, in which case the
