Merge pull request #9929 from anntzer/unused-imports

jklymak · web-flow · commit aad9759ba9ba · 2017-12-05T12:49:27.000-08:00
In tests, remove unused imports and sort some remaining imports.
diff --git a/lib/matplotlib/tests/test_agg.py b/lib/matplotlib/tests/test_agg.py
@@ -2,20 +2,17 @@
                         unicode_literals)
 
 import io
-from distutils.version import LooseVersion
 
 import numpy as np
 from numpy.testing import assert_array_almost_equal
 import pytest
 
+from matplotlib import (
+    collections, path, pyplot as plt, transforms as mtransforms, rcParams)
 from matplotlib.image import imread
 from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
 from matplotlib.figure import Figure
 from matplotlib.testing.decorators import image_comparison
-from matplotlib import pyplot as plt
-from matplotlib import collections
-from matplotlib import path, rcParams
-from matplotlib import transforms as mtransforms
 
 
 def test_repeated_save_with_alpha():
diff --git a/lib/matplotlib/tests/test_animation.py b/lib/matplotlib/tests/test_animation.py
@@ -3,7 +3,6 @@
 
 import six
 
-import os
 import sys
 import tempfile
 
diff --git a/lib/matplotlib/tests/test_backend_bases.py b/lib/matplotlib/tests/test_backend_bases.py
@@ -1,6 +1,5 @@
 from matplotlib.backend_bases import FigureCanvasBase
 from matplotlib.backend_bases import RendererBase
-from matplotlib.testing.decorators import image_comparison
 
 import matplotlib.pyplot as plt
 import matplotlib.transforms as transforms
diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py
@@ -10,19 +10,16 @@
 import sys
 import tempfile
 
+import numpy as np
 import pytest
 
-import numpy as np
-from matplotlib import checkdep_usetex, cm, rcParams
+from matplotlib import dviread, pyplot as plt, checkdep_usetex, rcParams
 from matplotlib.backends.backend_pdf import PdfPages
-from matplotlib import pyplot as plt
+from matplotlib.testing.compare import compare_images
+from matplotlib.testing.decorators import image_comparison
 from matplotlib.testing.determinism import (_determinism_source_date_epoch,
                                             _determinism_check)
-from matplotlib.testing.decorators import image_comparison
-from matplotlib import dviread
-from matplotlib.testing.compare import compare_images
 
-import matplotlib as mpl
 
 needs_usetex = pytest.mark.xfail(
     not checkdep_usetex(True),
diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
@@ -11,8 +11,6 @@
 import pytest
 import warnings
 
-import re
-
 
 def test_contour_shape_1d_valid():
 
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
@@ -6,11 +6,11 @@
 
 import datetime
 import dateutil
+import tempfile
+
 import numpy as np
 import pytest
 import pytz
-import tempfile
-import warnings
 
 try:
     # mock in python 3.3+
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -3,7 +3,6 @@
 
 import six
 
-import io
 import os
 import warnings
 from collections import OrderedDict
diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py
@@ -10,13 +10,9 @@
 from numpy.testing import assert_almost_equal
 import pytest
 
-from matplotlib.transforms import Bbox
 import matplotlib
 import matplotlib.pyplot as plt
 from matplotlib.testing.decorators import image_comparison
-from matplotlib.figure import Figure
-from matplotlib.text import Annotation, Text
-from matplotlib.backends.backend_agg import RendererAgg
 
 
 @image_comparison(baseline_images=['font_styles'])
diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py
@@ -5,7 +5,6 @@
 
 import matplotlib
 from matplotlib.testing.decorators import image_comparison
-from matplotlib.compat.subprocess import check_output
 import matplotlib.pyplot as plt
 
 
