Merge pull request #15210 from anntzer/unusedimports

jklymak · web-flow · commit ee2621764e3e · 2019-10-01T10:09:00.000-07:00
Explicitly list allowed "unused" imports, remove the rest.
diff --git a/.flake8 b/.flake8
@@ -7,7 +7,7 @@ ignore =
     E265, E266,
     E305, E306,
     E722, E741,
-    F401, F403, F811, F841,
+    F811, F841,
     # Some new flake8 ignores:
     N801, N802, N803, N806, N812,
     # pydocstyle
@@ -31,20 +31,49 @@ exclude =
 per-file-ignores =
     setup.py: E402
     setupext.py: E501
+    tests.py: F401
 
     tools/subset.py: E221, E251, E261, E302, E501
 
+    lib/matplotlib/__init__.py: F401
     lib/matplotlib/_cm.py: E202, E203, E302
     lib/matplotlib/_mathtext_data.py: E203, E261
+    lib/matplotlib/animation.py: F401
+    lib/matplotlib/axes/__init__.py: F401, F403
+    lib/matplotlib/axes/_axes.py: F401
+    lib/matplotlib/backends/backend_*.py: F401
+    lib/matplotlib/backends/qt_editor/formlayout.py: F401, F403
+    lib/matplotlib/cbook/__init__.py: F401
+    lib/matplotlib/figure.py: F401
     lib/matplotlib/font_manager.py: E221, E251, E501
+    lib/matplotlib/image.py: F401, F403
+    lib/matplotlib/lines.py: F401
     lib/matplotlib/mathtext.py: E221, E251
+    lib/matplotlib/pylab.py: F401, F403
+    lib/matplotlib/pyplot.py: F401
     lib/matplotlib/rcsetup.py: E501
+    lib/matplotlib/style/__init__.py: F401
+    lib/matplotlib/testing/conftest.py: F401
+    lib/matplotlib/testing/compare.py: F401
+    lib/matplotlib/testing/decorators.py: F401
+    lib/matplotlib/tests/conftest.py: F401
+    lib/matplotlib/tests/test_backend_qt.py: F401
     lib/matplotlib/tests/test_mathtext.py: E501
+    lib/matplotlib/text.py: F401
     lib/matplotlib/transforms.py: E201, E202, E203
+    lib/matplotlib/tri/__init__.py: F401, F403
     lib/matplotlib/tri/triinterpolate.py: E201, E221
-
+    lib/mpl_toolkits/axes_grid/*: F401, F403
+    lib/mpl_toolkits/axes_grid1/__init__.py: F401
     lib/mpl_toolkits/axes_grid1/axes_size.py: E272
+    lib/mpl_toolkits/axisartist/__init__.py: F401
     lib/mpl_toolkits/axisartist/angle_helper.py: E221
+    lib/mpl_toolkits/axisartist/axes_divider.py: F401
+    lib/mpl_toolkits/axisartist/axes_rgb.py: F401
+    lib/mpl_toolkits/axisartist/axislines.py: F401
+    lib/mpl_toolkits/mplot3d/__init__.py: F401
+    lib/mpl_toolkits/tests/conftest.py: F401
+    lib/pylab.py: F401, F403
 
     doc/conf.py: E402, E501
     tutorials/advanced/path_tutorial.py: E402, E501
diff --git a/doc/sphinxext/missing_references.py b/doc/sphinxext/missing_references.py
@@ -18,7 +18,7 @@
 from collections import defaultdict
 import json
 import logging
-from pathlib import Path, PosixPath
+from pathlib import Path
 
 from docutils.utils import get_source_line
 from docutils import nodes
diff --git a/examples/lines_bars_and_markers/bar_stacked.py b/examples/lines_bars_and_markers/bar_stacked.py
@@ -9,7 +9,6 @@
 bars.
 """
 
-import numpy as np
 import matplotlib.pyplot as plt
 
 
diff --git a/examples/lines_bars_and_markers/markevery_demo.py b/examples/lines_bars_and_markers/markevery_demo.py
@@ -17,12 +17,10 @@
 
 A slice or list/array can also be used with ``markevery`` to specify the
 markers to show.
-
 """
 
 import numpy as np
 import matplotlib.pyplot as plt
-import matplotlib.gridspec as gridspec
 
 # define a list of markevery cases to plot
 cases = [None,
diff --git a/examples/misc/load_converter.py b/examples/misc/load_converter.py
@@ -8,7 +8,7 @@
 """
 
 import dateutil.parser
-from matplotlib import cbook, dates
+from matplotlib import cbook
 import matplotlib.pyplot as plt
 import numpy as np
 
diff --git a/examples/misc/logos2.py b/examples/misc/logos2.py
@@ -7,11 +7,10 @@
 """
 
 import numpy as np
-import matplotlib as mpl
 import matplotlib.pyplot as plt
 import matplotlib.cm as cm
 import matplotlib.font_manager
-from matplotlib.patches import Circle, Rectangle, PathPatch
+from matplotlib.patches import Rectangle, PathPatch
 from matplotlib.textpath import TextPath
 import matplotlib.transforms as mtrans
 
diff --git a/examples/mplot3d/polys3d.py b/examples/mplot3d/polys3d.py
@@ -10,7 +10,6 @@
 
 from matplotlib.collections import PolyCollection
 import matplotlib.pyplot as plt
-from matplotlib import colors as mcolors
 import numpy as np
 
 # Fixing random state for reproducibility
diff --git a/examples/subplots_axes_and_figures/secondary_axis.py b/examples/subplots_axes_and_figures/secondary_axis.py
@@ -15,9 +15,7 @@
 import numpy as np
 import datetime
 import matplotlib.dates as mdates
-from matplotlib.transforms import Transform
-from matplotlib.ticker import (
-    AutoLocator, AutoMinorLocator)
+from matplotlib.ticker import AutoMinorLocator
 
 fig, ax = plt.subplots(constrained_layout=True)
 x = np.arange(0, 360, 1)
diff --git a/lib/matplotlib/afm.py b/lib/matplotlib/afm.py
@@ -39,7 +39,6 @@
 
 
 from ._mathtext_data import uni2type1
-from matplotlib.cbook import deprecated
 
 
 _log = logging.getLogger(__name__)
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -45,7 +45,6 @@
 
 import numpy as np
 
-import matplotlib as mpl
 from matplotlib import (
     backend_tools as tools, cbook, colors, textpath, tight_bbox, transforms,
     widgets, get_backend, is_interactive, rcParams)
diff --git a/lib/matplotlib/backends/__init__.py b/lib/matplotlib/backends/__init__.py
@@ -1,12 +1,7 @@
-import importlib
 import logging
 import os
 import sys
 
-import matplotlib
-from matplotlib import cbook
-from matplotlib.backend_bases import _Backend
-
 _log = logging.getLogger(__name__)
 
 
diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py
@@ -19,8 +19,7 @@
 
 from matplotlib import cbook, is_interactive
 from matplotlib._pylab_helpers import Gcf
-from matplotlib.backend_bases import (
-    _Backend, FigureCanvasBase, NavigationToolbar2)
+from matplotlib.backend_bases import _Backend, NavigationToolbar2
 from matplotlib.backends.backend_webagg_core import (
     FigureCanvasWebAggCore, FigureManagerWebAgg, NavigationToolbar2WebAgg,
     TimerTornado)
diff --git a/lib/matplotlib/backends/backend_wxcairo.py b/lib/matplotlib/backends/backend_wxcairo.py
@@ -1,10 +1,9 @@
-import wx
+import wx.lib.wxcairo as wxcairo
 
 from .backend_cairo import cairo, FigureCanvasCairo, RendererCairo
 from .backend_wx import (
     _BackendWx, _FigureCanvasWxBase, FigureFrameWx,
     NavigationToolbar2Wx as NavigationToolbar2WxCairo)
-import wx.lib.wxcairo as wxcairo
 
 
 class FigureFrameWxCairo(FigureFrameWx):
diff --git a/lib/matplotlib/backends/qt_editor/figureoptions.py b/lib/matplotlib/backends/qt_editor/figureoptions.py
@@ -3,11 +3,10 @@
 # see the Matplotlib licenses directory for a copy of the license
 
 
-"""Module that provides a GUI-based editor for matplotlib's figure options."""
+"""Module that provides a GUI-based editor for Matplotlib's figure options."""
 
 import re
 
-import matplotlib
 from matplotlib import cbook, cm, colors as mcolors, markers, image as mimage
 from matplotlib.backends.qt_compat import QtGui
 from matplotlib.backends.qt_editor import _formlayout
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -2,19 +2,16 @@
 A collection of utility functions and classes.  Originally, many
 (but not all) were from the Python Cookbook -- hence the name cbook.
 
-This module is safe to import from anywhere within matplotlib;
-it imports matplotlib only at runtime.
+This module is safe to import from anywhere within Matplotlib;
+it imports Matplotlib only at runtime.
 """
 
 import collections
 import collections.abc
 import contextlib
 import functools
-import glob
 import gzip
 import itertools
-import locale
-import numbers
 import operator
 import os
 from pathlib import Path
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -138,7 +138,6 @@
 import math
 import re
 import time
-import warnings
 
 from dateutil.rrule import (rrule, MO, TU, WE, TH, FR, SA, SU, YEARLY,
                             MONTHLY, WEEKLY, DAILY, HOURLY, MINUTELY,
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -145,7 +145,6 @@
 """
 
 from collections.abc import Sized
-from numbers import Number
 
 import numpy as np
 
@@ -372,7 +371,6 @@ def _set_mathtext_path(self):
         Submitted by tcb
         """
         from matplotlib.text import TextPath
-        from matplotlib.font_manager import FontProperties
 
         # again, the properties could be initialised just once outside
         # this function
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -61,12 +61,11 @@
 from matplotlib.patches import Polygon, Rectangle, Circle, Arrow
 from matplotlib.widgets import SubplotTool, Button, Slider, Widget
 
-from .ticker import TickHelper, Formatter, FixedFormatter, NullFormatter,\
-           FuncFormatter, FormatStrFormatter, ScalarFormatter,\
-           LogFormatter, LogFormatterExponent, LogFormatterMathtext,\
-           Locator, IndexLocator, FixedLocator, NullLocator,\
-           LinearLocator, LogLocator, AutoLocator, MultipleLocator,\
-           MaxNLocator
+from .ticker import (
+    TickHelper, Formatter, FixedFormatter, NullFormatter, FuncFormatter,
+    FormatStrFormatter, ScalarFormatter, LogFormatter, LogFormatterExponent,
+    LogFormatterMathtext, Locator, IndexLocator, FixedLocator, NullLocator,
+    LinearLocator, LogLocator, AutoLocator, MultipleLocator, MaxNLocator)
 from matplotlib.backends import _get_running_interactive_framework
 
 _log = logging.getLogger(__name__)
@@ -220,7 +219,7 @@ def switch_backend(newbackend):
 
     backend_mod = importlib.import_module(backend_name)
     Backend = type(
-        "Backend", (matplotlib.backends._Backend,), vars(backend_mod))
+        "Backend", (matplotlib.backend_bases._Backend,), vars(backend_mod))
     _log.debug("Loaded backend %s version %s.",
                newbackend, Backend.backend_version)
 
diff --git a/lib/matplotlib/testing/__init__.py b/lib/matplotlib/testing/__init__.py
@@ -1,10 +1,9 @@
 """
 Helper functions for testing.
 """
+
 import locale
 import logging
-import sys
-import warnings
 
 import matplotlib as mpl
 from matplotlib import cbook
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -17,7 +17,6 @@
 
 import matplotlib as mpl
 from matplotlib.testing.exceptions import ImageComparisonFailure
-from matplotlib import cbook
 
 __all__ = ['compare_images', 'comparable_formats']
 
diff --git a/lib/matplotlib/testing/jpl_units/EpochConverter.py b/lib/matplotlib/testing/jpl_units/EpochConverter.py
@@ -1,7 +1,5 @@
 """EpochConverter module containing class EpochConverter."""
 
-import numpy as np
-
 from matplotlib import cbook
 import matplotlib.units as units
 import matplotlib.dates as date_ticker
diff --git a/lib/matplotlib/testing/jpl_units/UnitDblConverter.py b/lib/matplotlib/testing/jpl_units/UnitDblConverter.py
@@ -81,9 +81,6 @@ def convert(value, unit, axis):
         = RETURN VALUE
         - Returns the value parameter converted to floats.
         """
-        # Delay-load due to circular dependencies.
-        import matplotlib.testing.jpl_units as U
-
         if not cbook.is_scalar_or_string(value):
             return [UnitDblConverter.convert(x, unit, axis) for x in value]
         # If the incoming value behaves like a number,
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1,6 +1,5 @@
 from collections import namedtuple
 from itertools import product
-from distutils.version import LooseVersion
 import io
 import platform
 
diff --git a/lib/matplotlib/tests/test_backend_cairo.py b/lib/matplotlib/tests/test_backend_cairo.py
@@ -1,14 +1,8 @@
 import numpy as np
-from io import BytesIO
-import os
-import tempfile
-import warnings
 
 import pytest
 
-import matplotlib.pyplot as plt
 from matplotlib.testing.decorators import check_figures_equal
-import matplotlib
 from matplotlib import (
     collections as mcollections, patches as mpatches, path as mpath)
 
diff --git a/lib/matplotlib/tests/test_backend_ps.py b/lib/matplotlib/tests/test_backend_ps.py
@@ -1,7 +1,5 @@
 import io
-import os
 from pathlib import Path
-import re
 import tempfile
 
 import pytest
diff --git a/lib/matplotlib/tests/test_backend_qt.py b/lib/matplotlib/tests/test_backend_qt.py
@@ -299,7 +299,6 @@ def test_double_resize():
 def test_canvas_reinit():
     import matplotlib.pyplot as plt
     from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg
-    from functools import partial
 
     called = False
 
diff --git a/lib/matplotlib/tests/test_basic.py b/lib/matplotlib/tests/test_basic.py
@@ -4,8 +4,6 @@
 import sys
 import textwrap
 
-import matplotlib
-
 
 def test_simple():
     assert 1 + 1 == 2
diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
@@ -10,7 +10,7 @@
 from matplotlib.colors import (BoundaryNorm, LogNorm, PowerNorm, Normalize,
                                DivergingNorm)
 from matplotlib.colorbar import ColorbarBase, _ColorbarLogLocator
-from matplotlib.ticker import LogLocator, LogFormatter, FixedLocator
+from matplotlib.ticker import FixedLocator
 
 
 def _get_cmap_norms():
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
@@ -10,7 +10,6 @@
 import pytest
 
 from matplotlib import rc_context
-from matplotlib.cbook import MatplotlibDeprecationWarning
 import matplotlib.dates as mdates
 import matplotlib.pyplot as plt
 from matplotlib.testing.decorators import image_comparison
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
@@ -12,7 +12,6 @@
 import matplotlib.collections as mcollections
 from matplotlib.legend_handler import HandlerTuple
 import matplotlib.legend as mlegend
-from matplotlib.cbook.deprecation import MatplotlibDeprecationWarning
 from matplotlib import rc_context
 
 
diff --git a/lib/matplotlib/tests/test_patches.py b/lib/matplotlib/tests/test_patches.py
@@ -5,7 +5,6 @@
 from numpy.testing import assert_almost_equal, assert_array_equal
 import pytest
 
-from matplotlib.cbook import MatplotlibDeprecationWarning
 from matplotlib.patches import Polygon, Rectangle, FancyArrowPatch
 from matplotlib.testing.decorators import image_comparison, check_figures_equal
 import matplotlib.pyplot as plt
diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
@@ -1,5 +1,4 @@
 import numpy as np
-import pytest
 
 from matplotlib.testing.decorators import image_comparison
 import matplotlib.pyplot as plt
diff --git a/lib/matplotlib/tests/test_scale.py b/lib/matplotlib/tests/test_scale.py
@@ -7,7 +7,6 @@
 import numpy as np
 from numpy.testing import assert_allclose
 import io
-import platform
 import pytest
 
 
diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py
diff --git a/lib/mpl_toolkits/axisartist/floating_axes.py b/lib/mpl_toolkits/axisartist/floating_axes.py
diff --git a/tutorials/introductory/pyplot.py b/tutorials/introductory/pyplot.py

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@`
`39`	`39`
`40`	`40`
`41`	`41`	`from ._mathtext_data import uni2type1`
`42`		`-from matplotlib.cbook import deprecated`
`43`	`42`
`44`	`43`
`45`	`44`	`_log = logging.getLogger(__name__)`