TST: tweak imports / whitespace in tests

tacaswell · tacaswell · commit 9a75feba7ff0 · 2017-01-15T13:21:35.000-05:00
diff --git a/lib/matplotlib/tests/test_coding_standards.py b/lib/matplotlib/tests/test_coding_standards.py
@@ -207,7 +207,6 @@ def test_pep8_conformance_installed_files():
                           'tests/test_delaunay.py',
                           'tests/test_dviread.py',
                           'tests/test_image.py',
-                          'tests/test_legend.py',
                           'tests/test_lines.py',
                           'tests/test_mathtext.py',
                           'tests/test_rcparams.py',
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
@@ -12,12 +12,11 @@
 import numpy as np
 
 from matplotlib.testing.decorators import image_comparison, cleanup
-from matplotlib.cbook import MatplotlibDeprecationWarning
 import matplotlib.pyplot as plt
 import matplotlib as mpl
-import matplotlib.patches as mpatches
 import matplotlib.transforms as mtrans
-import matplotlib.collections as mc
+import matplotlib.collections as mcollections
+
 
 @image_comparison(baseline_images=['legend_auto1'], remove_text=True)
 def test_legend_auto1():
@@ -110,7 +109,8 @@ def test_fancy():
     plt.subplot(121)
     plt.scatter(list(xrange(10)), list(xrange(10, 0, -1)), label='XX\nXX')
     plt.plot([5] * 10, 'o--', label='XX')
-    plt.errorbar(list(xrange(10)), list(xrange(10)), xerr=0.5, yerr=0.5, label='XX')
+    plt.errorbar(list(xrange(10)), list(xrange(10)), xerr=0.5,
+                 yerr=0.5, label='XX')
     plt.legend(loc="center left", bbox_to_anchor=[1.0, 0.5],
                ncol=2, shadow=True, title="My legend", numpoints=1)
 
@@ -123,7 +123,8 @@ def test_framealpha():
     plt.legend(framealpha=0.5)
 
 
-@image_comparison(baseline_images=['scatter_rc3', 'scatter_rc1'], remove_text=True)
+@image_comparison(baseline_images=['scatter_rc3', 'scatter_rc1'],
+                  remove_text=True)
 def test_rc():
     # using subplot triggers some offsetbox functionality untested elsewhere
     fig = plt.figure()
@@ -221,8 +222,8 @@ def test_warn_args_kwargs(self):
             ax.legend((lnc, lns), labels=('a', 'b'))
 
         warn.assert_called_with("You have mixed positional and keyword "
-                          "arguments, some input will be "
-                          "discarded.")
+                                "arguments, some input will be "
+                                "discarded.")
 
 
 @image_comparison(baseline_images=['legend_stackplot'], extensions=['png'])
@@ -273,10 +274,10 @@ def test_nanscatter():
 
 @image_comparison(baseline_images=['not_covering_scatter'], extensions=['png'])
 def test_not_covering_scatter():
-    colors = ['b','g','r']
+    colors = ['b', 'g', 'r']
 
     for n in range(3):
-        plt.scatter([n,], [n,], color=colors[n])
+        plt.scatter([n], [n], color=colors[n])
 
     plt.legend(['foo', 'foo', 'foo'], loc='best')
     plt.gca().set_xlim(-0.5, 2.2)
@@ -301,9 +302,9 @@ def test_linecollection_scaled_dashes():
     lines1 = [[(0, .5), (.5, 1)], [(.3, .6), (.2, .2)]]
     lines2 = [[[0.7, .2], [.8, .4]], [[.5, .7], [.6, .1]]]
     lines3 = [[[0.6, .2], [.8, .4]], [[.5, .7], [.1, .1]]]
-    lc1 = mc.LineCollection(lines1, linestyles="--", lw=3)
-    lc2 = mc.LineCollection(lines2, linestyles="-.")
-    lc3 = mc.LineCollection(lines3, linestyles=":", lw=.5)
+    lc1 = mcollections.LineCollection(lines1, linestyles="--", lw=3)
+    lc2 = mcollections.LineCollection(lines2, linestyles="-.")
+    lc3 = mcollections.LineCollection(lines3, linestyles=":", lw=.5)
 
     fig, ax = plt.subplots()
     ax.add_collection(lc1)
