From 5c0043a252b94de41dc62668634c3e65418387ba Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 5 Sep 2018 05:16:00 -0400 Subject: [PATCH 1/3] Remove unused stdlib imports. --- examples/subplots_axes_and_figures/demo_constrained_layout.py | 2 -- lib/matplotlib/__init__.py | 1 - lib/matplotlib/backends/__init__.py | 1 - lib/matplotlib/backends/backend_pgf.py | 1 - lib/matplotlib/cbook/__init__.py | 3 --- lib/matplotlib/docstring.py | 3 --- lib/matplotlib/sphinxext/tests/test_tinypages.py | 2 +- lib/matplotlib/testing/__init__.py | 1 - lib/matplotlib/testing/compare.py | 1 - lib/matplotlib/testing/determinism.py | 1 - lib/matplotlib/tests/__init__.py | 1 - lib/matplotlib/tests/test_contour.py | 1 - lib/matplotlib/tests/test_cycles.py | 1 - lib/matplotlib/tests/test_legend.py | 1 - lib/matplotlib/tests/test_lines.py | 1 - lib/matplotlib/tests/test_rcparams.py | 1 - lib/matplotlib/tests/test_style.py | 2 -- lib/matplotlib/tests/test_units.py | 1 - tutorials/colors/colormap-manipulation.py | 1 - 19 files changed, 1 insertion(+), 25 deletions(-) diff --git a/examples/subplots_axes_and_figures/demo_constrained_layout.py b/examples/subplots_axes_and_figures/demo_constrained_layout.py index f269ac9b4468..2f3af6a5a625 100644 --- a/examples/subplots_axes_and_figures/demo_constrained_layout.py +++ b/examples/subplots_axes_and_figures/demo_constrained_layout.py @@ -13,8 +13,6 @@ """ import matplotlib.pyplot as plt -import itertools -import warnings def example_plot(ax): diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index d5cf4d3d99fe..a393555eb04f 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -119,7 +119,6 @@ import contextlib import distutils.version import functools -import io import importlib import inspect from inspect import Parameter diff --git a/lib/matplotlib/backends/__init__.py b/lib/matplotlib/backends/__init__.py index 01e230df6804..f4ec9d91f919 100644 --- a/lib/matplotlib/backends/__init__.py +++ b/lib/matplotlib/backends/__init__.py @@ -2,7 +2,6 @@ import logging import os import sys -import traceback import matplotlib from matplotlib import cbook diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py index c989d38ddbb5..33972e66e6b8 100644 --- a/lib/matplotlib/backends/backend_pgf.py +++ b/lib/matplotlib/backends/backend_pgf.py @@ -1,6 +1,5 @@ import atexit import codecs -import errno import logging import math import os diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py index 419e1ec13356..2ff3bda5a936 100644 --- a/lib/matplotlib/cbook/__init__.py +++ b/lib/matplotlib/cbook/__init__.py @@ -9,12 +9,9 @@ import collections import collections.abc import contextlib -import datetime -import errno import functools import glob import gzip -import io import itertools import locale import numbers diff --git a/lib/matplotlib/docstring.py b/lib/matplotlib/docstring.py index 9a67c1af86bd..a97d10391eb2 100644 --- a/lib/matplotlib/docstring.py +++ b/lib/matplotlib/docstring.py @@ -1,6 +1,3 @@ -import sys -import types - from matplotlib import cbook diff --git a/lib/matplotlib/sphinxext/tests/test_tinypages.py b/lib/matplotlib/sphinxext/tests/test_tinypages.py index 50d94ee30311..ca2fb9f7754c 100644 --- a/lib/matplotlib/sphinxext/tests/test_tinypages.py +++ b/lib/matplotlib/sphinxext/tests/test_tinypages.py @@ -2,7 +2,7 @@ import filecmp from os.path import join as pjoin, dirname, isdir -from subprocess import call, Popen, PIPE +from subprocess import Popen, PIPE import sys import pytest diff --git a/lib/matplotlib/testing/__init__.py b/lib/matplotlib/testing/__init__.py index 2e19bd6d1563..9135362b10e5 100644 --- a/lib/matplotlib/testing/__init__.py +++ b/lib/matplotlib/testing/__init__.py @@ -1,4 +1,3 @@ -import functools import locale import warnings diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py index fc0e618de4f4..6e2c3b28853c 100644 --- a/lib/matplotlib/testing/compare.py +++ b/lib/matplotlib/testing/compare.py @@ -4,7 +4,6 @@ """ import atexit -import functools import hashlib import os from pathlib import Path diff --git a/lib/matplotlib/testing/determinism.py b/lib/matplotlib/testing/determinism.py index f43706ea5beb..06b7dee52ce6 100644 --- a/lib/matplotlib/testing/determinism.py +++ b/lib/matplotlib/testing/determinism.py @@ -2,7 +2,6 @@ Provides utilities to test output reproducibility. """ -import io import os import re import subprocess diff --git a/lib/matplotlib/tests/__init__.py b/lib/matplotlib/tests/__init__.py index 855d68142300..24230d30fd53 100644 --- a/lib/matplotlib/tests/__init__.py +++ b/lib/matplotlib/tests/__init__.py @@ -1,4 +1,3 @@ -import difflib import os from matplotlib import cbook diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py index 9868f4023cd7..85eb2bcd81fd 100644 --- a/lib/matplotlib/tests/test_contour.py +++ b/lib/matplotlib/tests/test_contour.py @@ -6,7 +6,6 @@ from numpy.testing import assert_array_almost_equal from matplotlib.colors import LogNorm import pytest -import warnings def test_contour_shape_1d_valid(): diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py index 8184d3eeeb0c..1254f3c7c7b2 100644 --- a/lib/matplotlib/tests/test_cycles.py +++ b/lib/matplotlib/tests/test_cycles.py @@ -1,4 +1,3 @@ -import warnings import platform from matplotlib.testing.decorators import image_comparison diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py index f3b7f5758d97..5f0c415a3e21 100644 --- a/lib/matplotlib/tests/test_legend.py +++ b/lib/matplotlib/tests/test_legend.py @@ -1,5 +1,4 @@ import collections -import inspect import platform from unittest import mock diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py index f933942d9532..e7cf19779e12 100644 --- a/lib/matplotlib/tests/test_lines.py +++ b/lib/matplotlib/tests/test_lines.py @@ -2,7 +2,6 @@ Tests specific to the lines module. """ -from io import BytesIO import itertools import timeit diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py index 3ad0e05ac91c..d2c646711749 100644 --- a/lib/matplotlib/tests/test_rcparams.py +++ b/lib/matplotlib/tests/test_rcparams.py @@ -1,7 +1,6 @@ from collections import OrderedDict import copy from itertools import chain -import locale import os from unittest import mock import warnings diff --git a/lib/matplotlib/tests/test_style.py b/lib/matplotlib/tests/test_style.py index f7b1a4a65af1..0d925d40e186 100644 --- a/lib/matplotlib/tests/test_style.py +++ b/lib/matplotlib/tests/test_style.py @@ -1,9 +1,7 @@ from collections import OrderedDict from contextlib import contextmanager import gc -import os from pathlib import Path -import shutil from tempfile import TemporaryDirectory import warnings diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py index 9433ed4105ef..4a6d1e87c89f 100644 --- a/lib/matplotlib/tests/test_units.py +++ b/lib/matplotlib/tests/test_units.py @@ -4,7 +4,6 @@ from matplotlib.testing.decorators import image_comparison import matplotlib.units as munits import numpy as np -import datetime import platform diff --git a/tutorials/colors/colormap-manipulation.py b/tutorials/colors/colormap-manipulation.py index e79b9dd60e22..264bfb8b8d58 100644 --- a/tutorials/colors/colormap-manipulation.py +++ b/tutorials/colors/colormap-manipulation.py @@ -26,7 +26,6 @@ import matplotlib.pyplot as plt from matplotlib import cm from matplotlib.colors import ListedColormap, LinearSegmentedColormap -from collections import OrderedDict viridis = cm.get_cmap('viridis', 12) print(viridis) From 12a8b294e3b809defabd0ecd9b61385b24081c0b Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 5 Sep 2018 23:42:41 -0400 Subject: [PATCH 2/3] Remove unused imports in tests. --- lib/matplotlib/sphinxext/tests/test_tinypages.py | 2 -- lib/matplotlib/tests/__init__.py | 3 --- lib/matplotlib/tests/test_backend_ps.py | 1 - lib/matplotlib/tests/test_mlab.py | 1 - lib/mpl_toolkits/tests/test_axes_grid1.py | 3 +-- 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/matplotlib/sphinxext/tests/test_tinypages.py b/lib/matplotlib/sphinxext/tests/test_tinypages.py index ca2fb9f7754c..6752d74afd9c 100644 --- a/lib/matplotlib/sphinxext/tests/test_tinypages.py +++ b/lib/matplotlib/sphinxext/tests/test_tinypages.py @@ -7,8 +7,6 @@ import pytest -from matplotlib import cbook - pytest.importorskip('sphinx') diff --git a/lib/matplotlib/tests/__init__.py b/lib/matplotlib/tests/__init__.py index 24230d30fd53..51167288ca81 100644 --- a/lib/matplotlib/tests/__init__.py +++ b/lib/matplotlib/tests/__init__.py @@ -1,8 +1,5 @@ import os -from matplotlib import cbook -from matplotlib.testing import setup - # Check that the test directories exist if not os.path.exists(os.path.join( diff --git a/lib/matplotlib/tests/test_backend_ps.py b/lib/matplotlib/tests/test_backend_ps.py index ad5febf0c420..617a2bb2f02a 100644 --- a/lib/matplotlib/tests/test_backend_ps.py +++ b/lib/matplotlib/tests/test_backend_ps.py @@ -4,7 +4,6 @@ import re import tempfile -import numpy as np import pytest import matplotlib diff --git a/lib/matplotlib/tests/test_mlab.py b/lib/matplotlib/tests/test_mlab.py index 30f2b9db4e4f..827bd5d8745d 100644 --- a/lib/matplotlib/tests/test_mlab.py +++ b/lib/matplotlib/tests/test_mlab.py @@ -9,7 +9,6 @@ import pytest import matplotlib.mlab as mlab -import matplotlib.cbook as cbook from matplotlib.cbook.deprecation import MatplotlibDeprecationWarning diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py index 896ba503f91f..04011e9f1ee0 100644 --- a/lib/mpl_toolkits/tests/test_axes_grid1.py +++ b/lib/mpl_toolkits/tests/test_axes_grid1.py @@ -16,8 +16,7 @@ AnchoredDirectionArrows) from matplotlib.colors import LogNorm -from matplotlib.transforms import Bbox, TransformedBbox, \ - blended_transform_factory +from matplotlib.transforms import Bbox, TransformedBbox from itertools import product import pytest From 3b4b77051a567178e367f53d8ab99018cab9f41e Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 6 Sep 2018 00:00:51 -0400 Subject: [PATCH 3/3] Remove some hopefully safe unused imports. --- lib/matplotlib/_layoutbox.py | 1 - lib/matplotlib/colorbar.py | 1 - lib/matplotlib/projections/geo.py | 1 - lib/matplotlib/testing/__init__.py | 1 - lib/mpl_toolkits/axes_grid1/colorbar.py | 1 - lib/mpl_toolkits/axisartist/floating_axes.py | 2 +- lib/mpl_toolkits/mplot3d/art3d.py | 5 ++--- tutorials/colors/colormap-manipulation.py | 1 - 8 files changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/matplotlib/_layoutbox.py b/lib/matplotlib/_layoutbox.py index 0109d7141e8b..663b0ab88367 100644 --- a/lib/matplotlib/_layoutbox.py +++ b/lib/matplotlib/_layoutbox.py @@ -20,7 +20,6 @@ import logging import numpy as np -import matplotlib _log = logging.getLogger(__name__) diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py index e2cdcb91a60f..ae65d70c2a33 100644 --- a/lib/matplotlib/colorbar.py +++ b/lib/matplotlib/colorbar.py @@ -26,7 +26,6 @@ import matplotlib as mpl import matplotlib.artist as martist -import matplotlib.cbook as cbook import matplotlib.collections as collections import matplotlib.colors as colors import matplotlib.contour as contour diff --git a/lib/matplotlib/projections/geo.py b/lib/matplotlib/projections/geo.py index f82bed8b2244..2254cb477075 100644 --- a/lib/matplotlib/projections/geo.py +++ b/lib/matplotlib/projections/geo.py @@ -1,6 +1,5 @@ import numpy as np -import matplotlib from matplotlib import rcParams from matplotlib.axes import Axes import matplotlib.axis as maxis diff --git a/lib/matplotlib/testing/__init__.py b/lib/matplotlib/testing/__init__.py index 9135362b10e5..580335395ce4 100644 --- a/lib/matplotlib/testing/__init__.py +++ b/lib/matplotlib/testing/__init__.py @@ -2,7 +2,6 @@ import warnings import matplotlib as mpl -from matplotlib import cbook from matplotlib.cbook import MatplotlibDeprecationWarning diff --git a/lib/mpl_toolkits/axes_grid1/colorbar.py b/lib/mpl_toolkits/axes_grid1/colorbar.py index baf6ca2d94d3..00578c43fd39 100644 --- a/lib/mpl_toolkits/axes_grid1/colorbar.py +++ b/lib/mpl_toolkits/axes_grid1/colorbar.py @@ -24,7 +24,6 @@ import matplotlib.cm as cm from matplotlib import docstring import matplotlib.ticker as ticker -import matplotlib.cbook as cbook import matplotlib.collections as collections import matplotlib.contour as contour from matplotlib.path import Path diff --git a/lib/mpl_toolkits/axisartist/floating_axes.py b/lib/mpl_toolkits/axisartist/floating_axes.py index f11d39a8b129..75f3cb0f8808 100644 --- a/lib/mpl_toolkits/axisartist/floating_axes.py +++ b/lib/mpl_toolkits/axisartist/floating_axes.py @@ -9,7 +9,7 @@ import numpy as np -from matplotlib.transforms import Affine2D, IdentityTransform +from matplotlib.transforms import IdentityTransform from . import grid_helper_curvelinear from .axis_artist import AxisArtist diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py index 177ab62eac5f..b5df9282485b 100644 --- a/lib/mpl_toolkits/mplot3d/art3d.py +++ b/lib/mpl_toolkits/mplot3d/art3d.py @@ -12,10 +12,9 @@ import numpy as np from matplotlib import ( - artist, cbook, colors as mcolors, lines, text as mtext, path as mpath) + artist, colors as mcolors, lines, text as mtext, path as mpath) from matplotlib.collections import ( - Collection, LineCollection, PolyCollection, PatchCollection, - PathCollection) + LineCollection, PolyCollection, PatchCollection, PathCollection) from matplotlib.colors import Normalize from matplotlib.patches import Patch from . import proj3d diff --git a/tutorials/colors/colormap-manipulation.py b/tutorials/colors/colormap-manipulation.py index 264bfb8b8d58..88997b1197f4 100644 --- a/tutorials/colors/colormap-manipulation.py +++ b/tutorials/colors/colormap-manipulation.py @@ -22,7 +22,6 @@ """ import numpy as np -import matplotlib as mpl import matplotlib.pyplot as plt from matplotlib import cm from matplotlib.colors import ListedColormap, LinearSegmentedColormap