Remove legacy contouring.

Author: anntzer

lib/matplotlib/contour.py

@@ -11,7 +11,6 @@
 import matplotlib as mpl
 import numpy as np
 from numpy import ma
-import matplotlib._cntr as _cntr
 import matplotlib._contour as _contour
 import matplotlib.path as mpath
 import matplotlib.ticker as ticker
@@ -1171,10 +1170,7 @@ def _contour_level_args(self, z, args):
             raise ValueError("Filled contours require at least 2 levels.")
 
         if len(self.levels) > 1 and np.min(np.diff(self.levels)) <= 0.0:
-            if hasattr(self, '_corner_mask') and self._corner_mask == 'legacy':
-                warnings.warn("Contour levels are not increasing")
-            else:
-                raise ValueError("Contour levels must be increasing")
+            raise ValueError("Contour levels must be increasing")
 
     @property
     def vmin(self):
@@ -1419,10 +1415,7 @@ def _process_args(self, *args, **kwargs):
             self.zmin = args[0].zmin
             self.zmax = args[0].zmax
             self._corner_mask = args[0]._corner_mask
-            if self._corner_mask == 'legacy':
-                contour_generator = args[0].Cntr
-            else:
-                contour_generator = args[0]._contour_generator
+            contour_generator = args[0]._contour_generator
             self._mins = args[0]._mins
             self._maxs = args[0]._maxs
         else:
@@ -1436,14 +1429,8 @@ def _process_args(self, *args, **kwargs):
             if _mask is ma.nomask or not _mask.any():
                 _mask = None
 
-            if self._corner_mask == 'legacy':
-                cbook.warn_deprecated('1.5',
-                                      name="corner_mask='legacy'",
-                                      alternative='corner_mask=False or True')
-                contour_generator = _cntr.Cntr(x, y, z.filled(), _mask)
-            else:
-                contour_generator = _contour.QuadContourGenerator(
-                    x, y, z.filled(), _mask, self._corner_mask, self.nchunk)
+            contour_generator = _contour.QuadContourGenerator(
+                x, y, z.filled(), _mask, self._corner_mask, self.nchunk)
 
             t = self.get_transform()
 
@@ -1460,43 +1447,26 @@ def _process_args(self, *args, **kwargs):
             self._mins = [ma.min(x), ma.min(y)]
             self._maxs = [ma.max(x), ma.max(y)]
 
-        if self._corner_mask == 'legacy':
-            self.Cntr = contour_generator
-        else:
-            self._contour_generator = contour_generator
+        self._contour_generator = contour_generator
 
         return kwargs
 
     def _get_allsegs_and_allkinds(self):
-        """
-        Create and return allsegs and allkinds by calling underlying C code.
-        """
+        """Compute ``allsegs`` and ``allkinds`` using C extension."""
         allsegs = []
         if self.filled:
             lowers, uppers = self._get_lowers_and_uppers()
             allkinds = []
             for level, level_upper in zip(lowers, uppers):
-                if self._corner_mask == 'legacy':
-                    nlist = self.Cntr.trace(level, level_upper,
-                                            nchunk=self.nchunk)
-                    nseg = len(nlist) // 2
-                    vertices = nlist[:nseg]
-                    kinds = nlist[nseg:]
-                else:
-                    vertices, kinds = \
-                        self._contour_generator.create_filled_contour(
-                                                           level, level_upper)
+                vertices, kinds = \
+                    self._contour_generator.create_filled_contour(
+                        level, level_upper)
                 allsegs.append(vertices)
                 allkinds.append(kinds)
         else:
             allkinds = None
             for level in self.levels:
-                if self._corner_mask == 'legacy':
-                    nlist = self.Cntr.trace(level)
-                    nseg = len(nlist) // 2
-                    vertices = nlist[:nseg]
-                else:
-                    vertices = self._contour_generator.create_contour(level)
+                vertices = self._contour_generator.create_contour(level)
                 allsegs.append(vertices)
         return allsegs, allkinds
 
@@ -1687,19 +1657,15 @@ def _initialize_x_y(self, z):
 
         Optional keyword arguments:
 
-          *corner_mask*: [ *True* | *False* | 'legacy' ]
+          *corner_mask*: bool, optional
             Enable/disable corner masking, which only has an effect if *Z* is
-            a masked array.  If *False*, any quad touching a masked point is
-            masked out.  If *True*, only the triangular corners of quads
+            a masked array.  If ``False``, any quad touching a masked point is
+            masked out.  If ``True``, only the triangular corners of quads
             nearest those points are always masked out, other triangular
             corners comprising three unmasked points are contoured as usual.
-            If 'legacy', the old contouring algorithm is used, which is
-            equivalent to *False* and is deprecated, only remaining whilst the
-            new algorithm is tested fully.
 
-            If not specified, the default is taken from
-            rcParams['contour.corner_mask'], which is True unless it has
-            been modified.
+            Defaults to ``rcParams['contour.corner_mask']``, which defaults to
+            ``True``.
 
           *colors*: [ *None* | string | (mpl_colors) ]
             If *None*, the colormap specified by cmap will be used.

lib/matplotlib/rcsetup.py

@@ -548,13 +548,6 @@ def validate_negative_linestyle_legacy(s):
         return (0, dashes)  # (offset, (solid, blank))
 
 
-def validate_corner_mask(s):
-    if s == 'legacy':
-        return s
-    else:
-        return validate_bool(s)
-
-
 validate_legend_loc = ValidateInStrings(
     'legend_loc',
     ['best',
@@ -1097,7 +1090,7 @@ def _validate_linestyle(ls):
 
     # contour props
     'contour.negative_linestyle': ['dashed', _validate_linestyle],
-    'contour.corner_mask':        [True, validate_corner_mask],
+    'contour.corner_mask':        [True, validate_bool],
 
     # errorbar props
     'errorbar.capsize':      [0, validate_float],

lib/matplotlib/tests/test_contour.py

@@ -303,12 +303,6 @@ def test_contourf_decreasing_levels():
     plt.figure()
     with pytest.raises(ValueError):
         plt.contourf(z, [1.0, 0.0])
-    # Legacy contouring algorithm gives a warning rather than raising an error,
-    # plus a DeprecationWarning.
-    with warnings.catch_warnings(record=True) as w:
-        warnings.simplefilter("always")
-        plt.contourf(z, [1.0, 0.0], corner_mask='legacy')
-        assert len(w) == 2
 
 
 def test_vminvmax_warning():

setup.py

@@ -66,7 +66,6 @@
     setupext.Image(),
     setupext.TTConv(),
     setupext.Path(),
-    setupext.ContourLegacy(),
     setupext.Contour(),
     setupext.QhullWrap(),
     setupext.Tri(),

setupext.py

@@ -1408,18 +1408,6 @@ def get_extension(self):
         return ext
 
 
-class ContourLegacy(SetupPackage):
-    name = "contour_legacy"
-
-    def get_extension(self):
-        sources = [
-            "src/cntr.c"
-            ]
-        ext = make_extension('matplotlib._cntr', sources)
-        Numpy().add_flags(ext)
-        return ext
-
-
 class Contour(SetupPackage):
     name = "contour"