From 2652cc0789f1e17d4954fa4f8f286dd688041b89 Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Thu, 24 Feb 2022 22:46:55 +0100 Subject: [PATCH] Simplify imports --- lib/matplotlib/axis.py | 3 +-- lib/matplotlib/container.py | 2 +- lib/matplotlib/image.py | 14 ++++++-------- lib/matplotlib/streamplot.py | 3 +-- lib/matplotlib/testing/jpl_units/EpochConverter.py | 3 +-- .../testing/jpl_units/UnitDblConverter.py | 3 +-- lib/matplotlib/tests/test_backend_bases.py | 3 +-- lib/matplotlib/tests/test_cbook.py | 3 +-- lib/matplotlib/tests/test_constrainedlayout.py | 3 +-- lib/matplotlib/tests/test_dates.py | 3 +-- lib/matplotlib/tests/test_figure.py | 3 +-- lib/matplotlib/tests/test_png.py | 3 +-- 12 files changed, 17 insertions(+), 29 deletions(-) diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py index 92b6b49eabbf..dc3e75a2a629 100644 --- a/lib/matplotlib/axis.py +++ b/lib/matplotlib/axis.py @@ -9,9 +9,8 @@ import numpy as np import matplotlib as mpl -from matplotlib import _api +from matplotlib import _api, cbook import matplotlib.artist as martist -import matplotlib.cbook as cbook import matplotlib.colors as mcolors import matplotlib.lines as mlines import matplotlib.scale as mscale diff --git a/lib/matplotlib/container.py b/lib/matplotlib/container.py index 0519773bf058..a58e55ca196c 100644 --- a/lib/matplotlib/container.py +++ b/lib/matplotlib/container.py @@ -1,5 +1,5 @@ +from matplotlib import cbook from matplotlib.artist import Artist -import matplotlib.cbook as cbook class Container(tuple): diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py index a7642a2cb21e..667b9e5e8474 100644 --- a/lib/matplotlib/image.py +++ b/lib/matplotlib/image.py @@ -13,17 +13,15 @@ import PIL.PngImagePlugin import matplotlib as mpl -from matplotlib import _api +from matplotlib import _api, cbook, cm +# For clarity, names from _image are given explicitly in this module +from matplotlib import _image +# For user convenience, the names from _image are also imported into +# the image namespace +from matplotlib._image import * import matplotlib.artist as martist from matplotlib.backend_bases import FigureCanvasBase import matplotlib.colors as mcolors -import matplotlib.cm as cm -import matplotlib.cbook as cbook -# For clarity, names from _image are given explicitly in this module: -import matplotlib._image as _image -# For user convenience, the names from _image are also imported into -# the image namespace: -from matplotlib._image import * from matplotlib.transforms import ( Affine2D, BboxBase, Bbox, BboxTransform, BboxTransformTo, IdentityTransform, TransformedBbox) diff --git a/lib/matplotlib/streamplot.py b/lib/matplotlib/streamplot.py index 06f1160b04e6..97bbc5a23597 100644 --- a/lib/matplotlib/streamplot.py +++ b/lib/matplotlib/streamplot.py @@ -6,11 +6,10 @@ import numpy as np import matplotlib -from matplotlib import _api, cm +from matplotlib import _api, cm, patches import matplotlib.colors as mcolors import matplotlib.collections as mcollections import matplotlib.lines as mlines -import matplotlib.patches as patches __all__ = ['streamplot'] diff --git a/lib/matplotlib/testing/jpl_units/EpochConverter.py b/lib/matplotlib/testing/jpl_units/EpochConverter.py index 2fa3d56259e3..f42d7b71d041 100644 --- a/lib/matplotlib/testing/jpl_units/EpochConverter.py +++ b/lib/matplotlib/testing/jpl_units/EpochConverter.py @@ -1,7 +1,6 @@ """EpochConverter module containing class EpochConverter.""" -from matplotlib import cbook -import matplotlib.units as units +from matplotlib import cbook, units import matplotlib.dates as date_ticker __all__ = ['EpochConverter'] diff --git a/lib/matplotlib/testing/jpl_units/UnitDblConverter.py b/lib/matplotlib/testing/jpl_units/UnitDblConverter.py index 859449a1ee75..23065379f581 100644 --- a/lib/matplotlib/testing/jpl_units/UnitDblConverter.py +++ b/lib/matplotlib/testing/jpl_units/UnitDblConverter.py @@ -2,8 +2,7 @@ import numpy as np -from matplotlib import cbook -import matplotlib.units as units +from matplotlib import cbook, units import matplotlib.projections.polar as polar __all__ = ['UnitDblConverter'] diff --git a/lib/matplotlib/tests/test_backend_bases.py b/lib/matplotlib/tests/test_backend_bases.py index 78833a8a7e29..ed3cc134bfb1 100644 --- a/lib/matplotlib/tests/test_backend_bases.py +++ b/lib/matplotlib/tests/test_backend_bases.py @@ -1,13 +1,12 @@ import re +from matplotlib import path, transforms from matplotlib.testing import _check_for_pgf from matplotlib.backend_bases import ( FigureCanvasBase, LocationEvent, MouseButton, MouseEvent, NavigationToolbar2, RendererBase) from matplotlib.figure import Figure import matplotlib.pyplot as plt -import matplotlib.transforms as transforms -import matplotlib.path as path import numpy as np import pytest diff --git a/lib/matplotlib/tests/test_cbook.py b/lib/matplotlib/tests/test_cbook.py index 86217ce89a88..dcb855f73ce7 100644 --- a/lib/matplotlib/tests/test_cbook.py +++ b/lib/matplotlib/tests/test_cbook.py @@ -11,8 +11,7 @@ assert_array_almost_equal) import pytest -from matplotlib import _api -import matplotlib.cbook as cbook +from matplotlib import _api, cbook import matplotlib.colors as mcolors from matplotlib.cbook import delete_masked_points diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py index 3d18e86cf258..bf6617d3197e 100644 --- a/lib/matplotlib/tests/test_constrainedlayout.py +++ b/lib/matplotlib/tests/test_constrainedlayout.py @@ -3,9 +3,8 @@ from matplotlib.testing.decorators import image_comparison import matplotlib.pyplot as plt -import matplotlib.gridspec as gridspec import matplotlib.transforms as mtransforms -from matplotlib import ticker, rcParams +from matplotlib import gridspec, ticker, rcParams def example_plot(ax, fontsize=12, nodec=False): diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py index eafced95f00b..a606b8b0cf47 100644 --- a/lib/matplotlib/tests/test_dates.py +++ b/lib/matplotlib/tests/test_dates.py @@ -6,12 +6,11 @@ import numpy as np import pytest -from matplotlib import rc_context, style +from matplotlib import _api, rc_context, style import matplotlib.dates as mdates import matplotlib.pyplot as plt from matplotlib.testing.decorators import image_comparison import matplotlib.ticker as mticker -import matplotlib._api as _api def test_date_numpyx(): diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py index ca8d458af193..9f68f63e5236 100644 --- a/lib/matplotlib/tests/test_figure.py +++ b/lib/matplotlib/tests/test_figure.py @@ -12,7 +12,7 @@ from PIL import Image import matplotlib as mpl -from matplotlib import rcParams +from matplotlib import gridspec, rcParams from matplotlib._api.deprecation import MatplotlibDeprecationWarning from matplotlib.testing.decorators import image_comparison, check_figures_equal from matplotlib.axes import Axes @@ -22,7 +22,6 @@ from matplotlib.ticker import AutoMinorLocator, FixedFormatter, ScalarFormatter import matplotlib.pyplot as plt import matplotlib.dates as mdates -import matplotlib.gridspec as gridspec @image_comparison(['figure_align_labels'], extensions=['png', 'svg'], diff --git a/lib/matplotlib/tests/test_png.py b/lib/matplotlib/tests/test_png.py index 133d3954452b..1e8ad89c9511 100644 --- a/lib/matplotlib/tests/test_png.py +++ b/lib/matplotlib/tests/test_png.py @@ -4,8 +4,7 @@ import pytest from matplotlib.testing.decorators import image_comparison -from matplotlib import pyplot as plt -import matplotlib.cm as cm +from matplotlib import cm, pyplot as plt @image_comparison(['pngsuite.png'], tol=0.03)