diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py index 6ae33938e189..5c9a419ed353 100644 --- a/lib/matplotlib/cbook/__init__.py +++ b/lib/matplotlib/cbook/__init__.py @@ -24,7 +24,6 @@ import types import warnings import weakref -from weakref import WeakMethod import numpy as np @@ -180,7 +179,7 @@ def connect(self, s, func): """ self._func_cid_map.setdefault(s, {}) try: - proxy = WeakMethod(func, self._remove_proxy) + proxy = weakref.WeakMethod(func, self._remove_proxy) except TypeError: proxy = _StrongRef(func) if proxy in self._func_cid_map[s]: diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py index 9a1f800d68d5..a3693c9cd219 100644 --- a/lib/matplotlib/offsetbox.py +++ b/lib/matplotlib/offsetbox.py @@ -33,7 +33,6 @@ from matplotlib.image import BboxImage from matplotlib.patches import ( FancyBboxPatch, FancyArrowPatch, bbox_artist as mbbox_artist) -from matplotlib.text import _AnnotationBase from matplotlib.transforms import Bbox, BboxBase, TransformedBbox @@ -1410,7 +1409,7 @@ def draw(self, renderer): self.stale = False -class AnnotationBbox(martist.Artist, _AnnotationBase): +class AnnotationBbox(martist.Artist, mtext._AnnotationBase): """ Container for an `OffsetBox` referring to a specific position *xy*. @@ -1475,10 +1474,10 @@ def __init__(self, offsetbox, xy, """ martist.Artist.__init__(self, **kwargs) - _AnnotationBase.__init__(self, - xy, - xycoords=xycoords, - annotation_clip=annotation_clip) + mtext._AnnotationBase.__init__(self, + xy, + xycoords=xycoords, + annotation_clip=annotation_clip) self.offsetbox = offsetbox diff --git a/lib/mpl_toolkits/axisartist/axis_artist.py b/lib/mpl_toolkits/axisartist/axis_artist.py index 64b61e7c9dc4..a5356ea08472 100644 --- a/lib/mpl_toolkits/axisartist/axis_artist.py +++ b/lib/mpl_toolkits/axisartist/axis_artist.py @@ -94,7 +94,6 @@ import matplotlib.artist as martist import matplotlib.text as mtext -from matplotlib.artist import Artist from matplotlib.collections import LineCollection from matplotlib.lines import Line2D from matplotlib.patches import PathPatch @@ -158,7 +157,7 @@ def draw(self, renderer): class AttributeCopier: @cbook.deprecated("3.2") - def __init__(self, ref_artist, klass=Artist): + def __init__(self, ref_artist, klass=martist.Artist): self._klass = klass self._ref_artist = ref_artist super().__init__() diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py index 2d51bf899a5c..cc327ce4da79 100644 --- a/lib/mpl_toolkits/mplot3d/axes3d.py +++ b/lib/mpl_toolkits/mplot3d/axes3d.py @@ -24,7 +24,6 @@ import matplotlib.docstring as docstring import matplotlib.scale as mscale from matplotlib.axes import Axes, rcParams -from matplotlib.colors import Normalize, LightSource from matplotlib.transforms import Bbox from matplotlib.tri.triangulation import Triangulation @@ -1650,7 +1649,7 @@ def _shade_colors(self, color, normals, lightsource=None): """ if lightsource is None: # chosen for backwards-compatibility - lightsource = LightSource(azdeg=225, altdeg=19.4712) + lightsource = mcolors.LightSource(azdeg=225, altdeg=19.4712) with np.errstate(invalid="ignore"): shade = ((normals / np.linalg.norm(normals, axis=1, keepdims=True)) @@ -1659,8 +1658,8 @@ def _shade_colors(self, color, normals, lightsource=None): if mask.any(): # convert dot product to allowed shading fractions - in_norm = Normalize(-1, 1) - out_norm = Normalize(0.3, 1).inverse + in_norm = mcolors.Normalize(-1, 1) + out_norm = mcolors.Normalize(0.3, 1).inverse def norm(x): return out_norm(in_norm(x)) diff --git a/setupext.py b/setupext.py index c6b5c1ce7926..aea7b8403761 100644 --- a/setupext.py +++ b/setupext.py @@ -16,7 +16,6 @@ import tarfile import textwrap import urllib.request -from urllib.request import Request import versioneer _log = logging.getLogger(__name__) @@ -99,7 +98,7 @@ def write_cache(local_fn, data): # default User-Agent, but not (for example) wget; so I don't feel too # bad passing in an empty User-Agent. with urllib.request.urlopen( - Request(url, headers={"User-Agent": ""})) as req: + urllib.request.Request(url, headers={"User-Agent": ""})) as req: file_contents = BytesIO(req.read()) file_contents.seek(0)