Skip to content

Commit 2a01277

Browse files
committed
MNT: Make unused imports explicit
... instead of using a full file ignore. This allows catching a few more unused imports.
1 parent 45f4888 commit 2a01277

File tree

8 files changed

+30
-36
lines changed

8 files changed

+30
-36
lines changed

.flake8

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,20 @@ exclude =
3131
.eggs
3232

3333
per-file-ignores =
34-
lib/matplotlib/__init__.py: E402, F401
3534
lib/matplotlib/_animation_data.py: E501
36-
lib/matplotlib/_api/__init__.py: F401
3735
lib/matplotlib/_cm.py: E122, E202, E203, E302
3836
lib/matplotlib/_mathtext.py: E221, E251
3937
lib/matplotlib/_mathtext_data.py: E122, E203, E261
40-
lib/matplotlib/axes/__init__.py: F401, F403
4138
lib/matplotlib/backends/backend_template.py: F401
4239
lib/matplotlib/font_manager.py: E501
43-
lib/matplotlib/image.py: F401, F403
4440
lib/matplotlib/mathtext.py: E221
4541
lib/matplotlib/pylab.py: F401, F403
46-
lib/matplotlib/pyplot.py: F401, F811
42+
lib/matplotlib/pyplot.py: F811
4743
lib/matplotlib/tests/test_mathtext.py: E501
4844
lib/matplotlib/transforms.py: E201, E202, E203
4945
lib/matplotlib/tri/_triinterpolate.py: E201, E221
5046
lib/mpl_toolkits/axes_grid1/axes_size.py: E272
51-
lib/mpl_toolkits/axisartist/__init__.py: F401
5247
lib/mpl_toolkits/axisartist/angle_helper.py: E221
53-
lib/pylab.py: F401, F403
5448

5549
doc/conf.py: E402
5650
galleries/users_explain/artists/paths.py: E402

lib/matplotlib/__init__.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,17 +151,16 @@
151151
import subprocess
152152
import sys
153153
import tempfile
154-
import warnings
155154

156-
import numpy
157155
from packaging.version import parse as parse_version
158156

159157
# cbook must import matplotlib only within function
160158
# definitions, so it is safe to import from it here.
161159
from . import _api, _version, cbook, _docstring, rcsetup
162160
from matplotlib.cbook import sanitize_sequence
163161
from matplotlib._api import MatplotlibDeprecationWarning
164-
from matplotlib.rcsetup import validate_backend, cycler
162+
from matplotlib.rcsetup import cycler # noqa: F401
163+
from matplotlib.rcsetup import validate_backend
165164

166165

167166
_log = logging.getLogger(__name__)
@@ -246,7 +245,7 @@ def _check_versions():
246245

247246
# Quickfix to ensure Microsoft Visual C++ redistributable
248247
# DLLs are loaded before importing kiwisolver
249-
from . import ft2font
248+
from . import ft2font # noqa: F401
250249

251250
for modname, minver in [
252251
("cycler", "0.10"),
@@ -1511,5 +1510,5 @@ def inner(ax, *args, data=None, **kwargs):
15111510

15121511
# workaround: we must defer colormaps import to after loading rcParams, because
15131512
# colormap creation depends on rcParams
1514-
from matplotlib.cm import _colormaps as colormaps
1515-
from matplotlib.colors import _color_sequences as color_sequences
1513+
from matplotlib.cm import _colormaps as colormaps # noqa: E402
1514+
from matplotlib.colors import _color_sequences as color_sequences # noqa: E402

lib/matplotlib/_api/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import sys
1717
import warnings
1818

19-
from .deprecation import (
19+
from .deprecation import ( # noqa: F401
2020
deprecated, warn_deprecated,
2121
rename_parameter, delete_parameter, make_keyword_only,
2222
deprecate_method_override, deprecate_privatize_attribute,

lib/matplotlib/axes/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from . import _base
2-
from ._axes import *
2+
from ._axes import Axes # noqa: F401
33

44
# Backcompat.
5-
from ._axes import Axes as Subplot
5+
Subplot = Axes
66

77

88
class _SubplotBaseMeta(type):

lib/matplotlib/image.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from matplotlib import _image
2020
# For user convenience, the names from _image are also imported into
2121
# the image namespace
22-
from matplotlib._image import *
22+
from matplotlib._image import * # noqa: F401, F403
2323
import matplotlib.artist as martist
2424
from matplotlib.backend_bases import FigureCanvasBase
2525
import matplotlib.colors as mcolors

lib/matplotlib/pyplot.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,20 @@
4545
import importlib
4646
import inspect
4747
import logging
48-
import re
4948
import sys
5049
import threading
5150
import time
52-
from typing import cast, overload
51+
from typing import TYPE_CHECKING, cast, overload
5352

54-
from cycler import cycler
53+
from cycler import cycler # noqa: F401
5554
import matplotlib
5655
import matplotlib.colorbar
5756
import matplotlib.image
5857
from matplotlib import _api
59-
from matplotlib import ( # Re-exported for typing.
58+
from matplotlib import ( # noqa: F401 Re-exported for typing.
6059
cm as cm, get_backend as get_backend, rcParams as rcParams, style as style)
61-
from matplotlib import _pylab_helpers, interactive
60+
from matplotlib import _pylab_helpers
61+
from matplotlib import interactive # noqa: F401
6262
from matplotlib import cbook
6363
from matplotlib import _docstring
6464
from matplotlib.backend_bases import (
@@ -67,19 +67,18 @@
6767
from matplotlib.gridspec import GridSpec, SubplotSpec
6868
from matplotlib import rcsetup, rcParamsDefault, rcParamsOrig
6969
from matplotlib.artist import Artist
70-
from matplotlib.axes import Axes, Subplot # type: ignore
70+
from matplotlib.axes import Axes
71+
from matplotlib.axes import Subplot # noqa: F401
7172
from matplotlib.projections import PolarAxes # type: ignore
7273
from matplotlib import mlab # for detrend_none, window_hanning
73-
from matplotlib.scale import get_scale_names
74+
from matplotlib.scale import get_scale_names # noqa: F401
7475

7576
from matplotlib.cm import _colormaps
76-
from matplotlib.cm import register_cmap # type: ignore
77+
from matplotlib.cm import register_cmap # type: ignore # noqa: F401
7778
from matplotlib.colors import _color_sequences
7879

7980
import numpy as np
8081

81-
from typing import TYPE_CHECKING, cast
82-
8382
if TYPE_CHECKING:
8483
from collections.abc import Callable, Hashable, Iterable, Sequence
8584
import datetime
@@ -131,10 +130,11 @@
131130
from matplotlib.colors import Normalize
132131
from matplotlib.lines import Line2D, AxLine
133132
from matplotlib.text import Text, Annotation
134-
from matplotlib.patches import Polygon, Rectangle, Circle, Arrow
135-
from matplotlib.widgets import Button, Slider, Widget
133+
from matplotlib.patches import Arrow, Circle, Rectangle # noqa: F401
134+
from matplotlib.patches import Polygon
135+
from matplotlib.widgets import Button, Slider, Widget # noqa: F401
136136

137-
from .ticker import (
137+
from .ticker import ( # noqa: F401
138138
TickHelper, Formatter, FixedFormatter, NullFormatter, FuncFormatter,
139139
FormatStrFormatter, ScalarFormatter, LogFormatter, LogFormatterExponent,
140140
LogFormatterMathtext, Locator, IndexLocator, FixedLocator, NullLocator,

lib/mpl_toolkits/axisartist/__init__.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
from .axislines import (
2-
Axes, AxesZero, AxisArtistHelper, AxisArtistHelperRectlinear,
1+
from .axislines import Axes
2+
from .axislines import ( # noqa: F401
3+
AxesZero, AxisArtistHelper, AxisArtistHelperRectlinear,
34
GridHelperBase, GridHelperRectlinear, Subplot, SubplotZero)
4-
from .axis_artist import AxisArtist, GridlinesCollection
5-
from .grid_helper_curvelinear import GridHelperCurveLinear
6-
from .floating_axes import FloatingAxes, FloatingSubplot
5+
from .axis_artist import AxisArtist, GridlinesCollection # noqa: F401
6+
from .grid_helper_curvelinear import GridHelperCurveLinear # noqa: F401
7+
from .floating_axes import FloatingAxes, FloatingSubplot # noqa: F401
78
from mpl_toolkits.axes_grid1.parasite_axes import (
89
host_axes_class_factory, parasite_axes_class_factory)
910

lib/pylab.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
from matplotlib.pylab import *
1+
from matplotlib.pylab import * # noqa: F401, F403
22
import matplotlib.pylab
33
__doc__ = matplotlib.pylab.__doc__

0 commit comments

Comments
 (0)