Remove remaining deprecations from 3.5

Author: QuLogic

doc/api/prev_api_changes/api_changes_3.5.0/deprecations.rst

@@ -162,7 +162,7 @@ implement a ``convert`` method that not only accepted instances of the unit,
 but also unitless values (which are passed through as is). This is no longer
 the case (``convert`` is never called with a unitless value), and such support
 in `.StrCategoryConverter` is deprecated. Likewise, the
-`.ConversionInterface.is_numlike` helper is deprecated.
+``.ConversionInterface.is_numlike`` helper is deprecated.
 
 Consider calling `.Axis.convert_units` instead, which still supports unitless
 values.

doc/api/prev_api_changes/api_changes_3.5.0/removals.rst

@@ -282,7 +282,7 @@ Arguments
 - The *dummy* parameter of `.RendererPgf` has been removed.
 - The *props* parameter of `.Shadow` has been removed; use keyword arguments
   instead.
-- The *recursionlimit* parameter of `matplotlib.test` has been removed.
+- The *recursionlimit* parameter of ``matplotlib.test`` has been removed.
 - The *label* parameter of `.Tick` has no effect and has been removed.
 - `~.ticker.MaxNLocator` no longer accepts a positional parameter and the
   keyword argument *nbins* simultaneously because they specify the same

doc/api/testing_api.rst

@@ -3,11 +3,6 @@
 **********************
 
 
-:func:`matplotlib.test`
-=======================
-
-.. autofunction:: matplotlib.test
-
 :mod:`matplotlib.testing`
 =========================
 

lib/matplotlib/__init__.py

@@ -1302,58 +1302,6 @@ def _init_tests():
                 "" if ft2font.__freetype_build_type__ == 'local' else "not "))
 
 
-@_api.deprecated("3.5", alternative='pytest')
-def test(verbosity=None, coverage=False, **kwargs):
-    """Run the matplotlib test suite."""
-
-    try:
-        import pytest
-    except ImportError:
-        print("matplotlib.test requires pytest to run.")
-        return -1
-
-    if not os.path.isdir(os.path.join(os.path.dirname(__file__), 'tests')):
-        print("Matplotlib test data is not installed")
-        return -1
-
-    old_backend = get_backend()
-    try:
-        use('agg')
-
-        args = kwargs.pop('argv', [])
-        provide_default_modules = True
-        use_pyargs = True
-        for arg in args:
-            if any(arg.startswith(module_path)
-                   for module_path in default_test_modules):
-                provide_default_modules = False
-                break
-            if os.path.exists(arg):
-                provide_default_modules = False
-                use_pyargs = False
-                break
-        if use_pyargs:
-            args += ['--pyargs']
-        if provide_default_modules:
-            args += default_test_modules
-
-        if coverage:
-            args += ['--cov']
-
-        if verbosity:
-            args += ['-' + 'v' * verbosity]
-
-        retcode = pytest.main(args, **kwargs)
-    finally:
-        if old_backend.lower() != 'agg':
-            use(old_backend)
-
-    return retcode
-
-
-test.__test__ = False  # pytest: this function is not a test
-
-
 def _replacer(data, value):
     """
     Either returns ``data[value]`` or passes ``data`` back, converts either to

lib/matplotlib/axes/_axes.py

@@ -5792,18 +5792,6 @@ def _interp_grid(X):
         C = cbook.safe_masked_invalid(C)
         return X, Y, C, shading
 
-    def _pcolor_grid_deprecation_helper(self):
-        grid_active = any(axis._major_tick_kw["gridOn"]
-                          for axis in self._axis_map.values())
-        # explicit is-True check because get_axisbelow() can also be 'line'
-        grid_hidden_by_pcolor = self.get_axisbelow() is True
-        if grid_active and not grid_hidden_by_pcolor:
-            _api.warn_deprecated(
-                "3.5", message="Auto-removal of grids by pcolor() and "
-                "pcolormesh() is deprecated since %(since)s and will be "
-                "removed %(removal)s; please call grid(False) first.")
-        self.grid(False)
-
     @_preprocess_data()
     @_docstring.dedent_interpd
     def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,
@@ -6008,7 +5996,6 @@ def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,
         collection = mcoll.PolyCollection(
             verts, array=C, cmap=cmap, norm=norm, alpha=alpha, **kwargs)
         collection._scale_norm(norm, vmin, vmax)
-        self._pcolor_grid_deprecation_helper()
 
         x = X.compressed()
         y = Y.compressed()
@@ -6242,7 +6229,6 @@ def pcolormesh(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
             coords, antialiased=antialiased, shading=shading,
             array=C, cmap=cmap, norm=norm, alpha=alpha, **kwargs)
         collection._scale_norm(norm, vmin, vmax)
-        self._pcolor_grid_deprecation_helper()
 
         coords = coords.reshape(-1, 2)  # flatten the grid structure; keep x, y
 

lib/matplotlib/axes/_base.py

@@ -1,4 +1,4 @@
-from collections.abc import Iterable, MutableSequence
+from collections.abc import Iterable, Sequence
 from contextlib import ExitStack
 import functools
 import inspect
@@ -1403,7 +1403,7 @@ def cla(self):
         else:
             self.clear()
 
-    class ArtistList(MutableSequence):
+    class ArtistList(Sequence):
         """
         A sublist of Axes children based on their type.
 
@@ -1414,7 +1414,7 @@ class ArtistList(MutableSequence):
         This class exists only for the transition period to warn on the
         deprecated modification of artist lists.
         """
-        def __init__(self, axes, prop_name, add_name,
+        def __init__(self, axes, prop_name,
                      valid_types=None, invalid_types=None):
             """
             Parameters
@@ -1425,9 +1425,6 @@ def __init__(self, axes, prop_name, add_name,
             prop_name : str
                 The property name used to access this sublist from the Axes;
                 used to generate deprecation warnings.
-            add_name : str
-                The method name used to add Artists of this sublist's type to
-                the Axes; used to generate deprecation warnings.
             valid_types : list of type, optional
                 A list of types that determine which children will be returned
                 by this sublist. If specified, then the Artists in the sublist
@@ -1442,7 +1439,6 @@ def __init__(self, axes, prop_name, add_name,
             """
             self._axes = axes
             self._prop_name = prop_name
-            self._add_name = add_name
             self._type_check = lambda artist: (
                 (not valid_types or isinstance(artist, valid_types)) and
                 (not invalid_types or not isinstance(artist, invalid_types))
@@ -1468,103 +1464,47 @@ def __getitem__(self, key):
         def __add__(self, other):
             if isinstance(other, (list, _AxesBase.ArtistList)):
                 return [*self, *other]
+            if isinstance(other, (tuple, _AxesBase.ArtistList)):
+                return (*self, *other)
             return NotImplemented
 
         def __radd__(self, other):
             if isinstance(other, list):
                 return other + list(self)
+            if isinstance(other, tuple):
+                return other + tuple(self)
             return NotImplemented
 
-        def insert(self, index, item):
-            _api.warn_deprecated(
-                '3.5',
-                name=f'modification of the Axes.{self._prop_name}',
-                obj_type='property',
-                alternative=f'Axes.{self._add_name}')
-            try:
-                index = self._axes._children.index(self[index])
-            except IndexError:
-                index = None
-            getattr(self._axes, self._add_name)(item)
-            if index is not None:
-                # Move new item to the specified index, if there's something to
-                # put it before.
-                self._axes._children[index:index] = self._axes._children[-1:]
-                del self._axes._children[-1]
-
-        def __setitem__(self, key, item):
-            _api.warn_deprecated(
-                '3.5',
-                name=f'modification of the Axes.{self._prop_name}',
-                obj_type='property',
-                alternative=f'Artist.remove() and Axes.f{self._add_name}')
-            del self[key]
-            if isinstance(key, slice):
-                key = key.start
-            if not np.iterable(item):
-                self.insert(key, item)
-                return
-
-            try:
-                index = self._axes._children.index(self[key])
-            except IndexError:
-                index = None
-            for i, artist in enumerate(item):
-                getattr(self._axes, self._add_name)(artist)
-            if index is not None:
-                # Move new items to the specified index, if there's something
-                # to put it before.
-                i = -(i + 1)
-                self._axes._children[index:index] = self._axes._children[i:]
-                del self._axes._children[i:]
-
-        def __delitem__(self, key):
-            _api.warn_deprecated(
-                '3.5',
-                name=f'modification of the Axes.{self._prop_name}',
-                obj_type='property',
-                alternative='Artist.remove()')
-            if isinstance(key, slice):
-                for artist in self[key]:
-                    artist.remove()
-            else:
-                self[key].remove()
-
     @property
     def artists(self):
-        return self.ArtistList(self, 'artists', 'add_artist', invalid_types=(
+        return self.ArtistList(self, 'artists', invalid_types=(
             mcoll.Collection, mimage.AxesImage, mlines.Line2D, mpatches.Patch,
             mtable.Table, mtext.Text))
 
     @property
     def collections(self):
-        return self.ArtistList(self, 'collections', 'add_collection',
+        return self.ArtistList(self, 'collections',
                                valid_types=mcoll.Collection)
 
     @property
     def images(self):
-        return self.ArtistList(self, 'images', 'add_image',
-                               valid_types=mimage.AxesImage)
+        return self.ArtistList(self, 'images', valid_types=mimage.AxesImage)
 
     @property
     def lines(self):
-        return self.ArtistList(self, 'lines', 'add_line',
-                               valid_types=mlines.Line2D)
+        return self.ArtistList(self, 'lines', valid_types=mlines.Line2D)
 
     @property
     def patches(self):
-        return self.ArtistList(self, 'patches', 'add_patch',
-                               valid_types=mpatches.Patch)
+        return self.ArtistList(self, 'patches', valid_types=mpatches.Patch)
 
     @property
     def tables(self):
-        return self.ArtistList(self, 'tables', 'add_table',
-                               valid_types=mtable.Table)
+        return self.ArtistList(self, 'tables', valid_types=mtable.Table)
 
     @property
     def texts(self):
-        return self.ArtistList(self, 'texts', 'add_artist',
-                               valid_types=mtext.Text)
+        return self.ArtistList(self, 'texts', valid_types=mtext.Text)
 
     def get_facecolor(self):
         """Get the facecolor of the Axes."""

lib/matplotlib/backend_bases.py

@@ -1969,7 +1969,7 @@ def leave_notify_event(self, guiEvent=None):
 
     @_api.deprecated("3.6", alternative=(
         "callbacks.process('enter_notify_event', LocationEvent(...))"))
-    def enter_notify_event(self, guiEvent=None, xy=None):
+    def enter_notify_event(self, guiEvent=None, *, xy):
         """
         Callback processing for the mouse cursor entering the canvas.
 
@@ -1983,18 +1983,7 @@ def enter_notify_event(self, guiEvent=None, xy=None):
         xy : (float, float)
             The coordinate location of the pointer when the canvas is entered.
         """
-        if xy is not None:
-            x, y = xy
-            self._lastx, self._lasty = x, y
-        else:
-            x = None
-            y = None
-            _api.warn_deprecated(
-                '3.0', removal='3.5', name='enter_notify_event',
-                message='Since %(since)s, %(name)s expects a location but '
-                'your backend did not pass one. This will become an error '
-                '%(removal)s.')
-
+        self._lastx, self._lasty = x, y = xy
         event = LocationEvent('figure_enter_event', self, x, y, guiEvent)
         self.callbacks.process('figure_enter_event', event)
 

lib/matplotlib/category.py

@@ -58,12 +58,6 @@ def convert(value, unit, axis):
             is_numlike = all(units.ConversionInterface.is_numlike(v)
                              and not isinstance(v, (str, bytes))
                              for v in values)
-        if values.size and is_numlike:
-            _api.warn_deprecated(
-                "3.5", message="Support for passing numbers through unit "
-                "converters is deprecated since %(since)s and support will be "
-                "removed %(removal)s; use Axis.convert_units instead.")
-            return np.asarray(values, dtype=float)
         # force an update so it also does type checking
         unit.update(values)
         return np.vectorize(unit._mapping.__getitem__, otypes=[float])(values)

lib/matplotlib/legend_handler.py

@@ -27,7 +27,6 @@
     def legend_artist(self, legend, orig_handle, fontsize, handlebox)
 """
 
-from collections.abc import Sequence
 from itertools import cycle
 
 import numpy as np
@@ -132,9 +131,6 @@ def legend_artist(self, legend, orig_handle,
                                       xdescent, ydescent, width, height,
                                       fontsize, handlebox.get_transform())
 
-        if isinstance(artists, _Line2DHandleList):
-            artists = [artists[0]]
-
         # create_artists will return a list of artists.
         for a in artists:
             handlebox.add_artist(a)
@@ -277,24 +273,6 @@ def create_artists(self, legend, orig_handle,
         return [legline, legline_marker]
 
 
-class _Line2DHandleList(Sequence):
-    def __init__(self, legline):
-        self._legline = legline
-
-    def __len__(self):
-        return 2
-
-    def __getitem__(self, index):
-        if index != 0:
-            # Make HandlerLine2D return [self._legline] directly after
-            # deprecation elapses.
-            _api.warn_deprecated(
-                "3.5", message="Access to the second element returned by "
-                "HandlerLine2D is deprecated since %(since)s; it will be "
-                "removed %(removal)s.")
-        return [self._legline, self._legline][index]
-
-
 class HandlerLine2D(HandlerNpoints):
     """
     Handler for `.Line2D` instances.
@@ -331,7 +309,7 @@ def create_artists(self, legend, orig_handle,
 
         legline.set_transform(trans)
 
-        return _Line2DHandleList(legline)
+        return [legline]
 
 
 class HandlerPatch(HandlerBase):
@@ -790,8 +768,6 @@ def create_artists(self, legend, orig_handle,
             _a_list = handler.create_artists(
                 legend, handle1,
                 next(xds_cycle), ydescent, width, height, fontsize, trans)
-            if isinstance(_a_list, _Line2DHandleList):
-                _a_list = [_a_list[0]]
             a_list.extend(_a_list)
 
         return a_list