Merge branch 'pep8_on_tests'

Conflicts:
	lib/matplotlib/tests/test_agg.py
	lib/matplotlib/tests/test_backend_pdf.py
	lib/matplotlib/tests/test_backend_pgf.py
	lib/matplotlib/tests/test_coding_standards.py
	lib/matplotlib/tests/test_colors.py
	lib/matplotlib/tests/test_contour.py

Author: dmcdougall

lib/matplotlib/tests/__init__.py

@@ -1,28 +1,31 @@
 from __future__ import print_function
-from matplotlib import rcParams, rcdefaults, use
 
 import difflib
 
+from matplotlib import rcParams, rcdefaults, use
+
 
 _multiprocess_can_split_ = True
 
 
 def setup():
-    use('Agg', warn=False) # use Agg backend for these tests
+    use('Agg', warn=False)  # use Agg backend for these tests
 
     # These settings *must* be hardcoded for running the comparison
     # tests and are not necessarily the default values as specified in
     # rcsetup.py
-    rcdefaults() # Start with all defaults
+    rcdefaults()  # Start with all defaults
     rcParams['font.family'] = 'Bitstream Vera Sans'
     rcParams['text.hinting'] = False
     rcParams['text.hinting_factor'] = 8
 
 
 def assert_str_equal(reference_str, test_str,
-                     format_str='String {str1} and {str2} do not match:\n{differences}'):
+                     format_str=('String {str1} and {str2} do not '
+                                 'match:\n{differences}')):
     """
-    Assert the two strings are equal. If not, fail and print their diffs using difflib.
+    Assert the two strings are equal. If not, fail and print their
+    diffs using difflib.
 
     """
     if reference_str != test_str:

lib/matplotlib/tests/test_agg.py

@@ -4,10 +4,8 @@
 import os
 import tempfile
 
-
 from numpy.testing import assert_array_almost_equal
 
-
 from matplotlib.image import imread
 from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
 from matplotlib.figure import Figure
@@ -103,7 +101,8 @@ def report_memory(i):
 ##     avgMem = (end - start) / float(N)
 ##     print 'Average memory consumed per loop: %1.4f\n' % (avgMem)
 
-##     #TODO: Verify the expected mem usage and approximate tolerance that should be used
+##     #TODO: Verify the expected mem usage and approximate tolerance that
+##     # should be used
 ##     #self.checkClose( 0.32, avgMem, absTol = 0.1 )
 
 ##     # w/o text and w/o write_png: Average memory consumed per loop: 0.02

lib/matplotlib/tests/test_animation.py

@@ -1,6 +1,9 @@
+from __future__ import print_function
 import os
 import tempfile
+
 import numpy as np
+
 from matplotlib import pyplot as plt
 from matplotlib import animation
 from matplotlib.testing.noseclasses import KnownFailureTest
@@ -13,7 +16,6 @@
                      imagemagick='gif', imagemagick_file='gif')
 
 
-
 # Smoke test for saving animations.  In the future, we should probably
 # design more sophisticated tests which compare resulting frames a-la
 # matplotlib.testing.image_comparison
@@ -46,6 +48,6 @@ def animate(i):
     anim.save(F.name, fps=30, writer=writer)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     import nose
-    nose.runmodule()
+    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)

lib/matplotlib/tests/test_arrow_patches.py

@@ -1,20 +1,24 @@
+from __future__ import print_function
+
 import matplotlib.pyplot as plt
 from matplotlib.testing.decorators import image_comparison
 import matplotlib
 
+
 def draw_arrow(ax, t, r):
-    ax.annotate('', xy=(0.5, 0.5+r), xytext=(0.5, 0.5), size=30,
+    ax.annotate('', xy=(0.5, 0.5 + r), xytext=(0.5, 0.5), size=30,
                 arrowprops=dict(arrowstyle=t,
                                 fc="b", ec='k'))
 
+
 @image_comparison(baseline_images=['fancyarrow_test_image'])
 def test_fancyarrow():
     r = [0.4, 0.3, 0.2, 0.1]
     t = ["fancy", "simple", matplotlib.patches.ArrowStyle.Fancy()]
 
     fig, axes = plt.subplots(len(t), len(r), squeeze=False,
                              subplot_kw=dict(aspect=True),
-                         figsize=(8, 4.5))
+                             figsize=(8, 4.5))
 
     for i_r, r1 in enumerate(r):
         for i_t, t1 in enumerate(t):
@@ -23,7 +27,6 @@ def test_fancyarrow():
             ax.tick_params(labelleft=False, labelbottom=False)
 
 
-if __name__=='__main__':
+if __name__ == '__main__':
     import nose
-    nose.runmodule(argv=['-s','--with-doctest'], exit=False)
-
+    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)

lib/matplotlib/tests/test_artist.py

@@ -1,11 +1,7 @@
 from __future__ import print_function
 
-import copy
-
-
 import numpy as np
 
-
 import matplotlib.pyplot as plt
 import matplotlib.patches as mpatches
 import matplotlib.path as mpath
@@ -93,16 +89,6 @@ def test_collection_transform_of_none():
     assert isinstance(c._transOffset, mtrans.IdentityTransform)
 
 
-def test_point_in_path():
-    # Test #1787
-    verts2 = [(0,0), (0,1), (1,1), (1,0), (0,0)]
-
-    path = mpath.Path(verts2, closed=True)
-    points = [(0.5,0.5), (1.5,0.5)]
-
-    assert np.all(path.contains_points(points) == [True, False])
-
-
 @image_comparison(baseline_images=["clip_path_clipping"], remove_text=True)
 def test_clipping():
     exterior = mpath.Path.unit_rectangle().deepcopy()
@@ -134,6 +120,6 @@ def test_clipping():
     ax1.set_ylim([-3, 3])
 
 
-if __name__=='__main__':
+if __name__ == '__main__':
     import nose
-    nose.runmodule(argv=['-s','--with-doctest'], exit=False)
+    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)

lib/matplotlib/tests/test_backend_pdf.py

@@ -1,13 +1,14 @@
 # -*- encoding: utf-8 -*-
 
 import io
+import os
 
 import numpy as np
 
 from matplotlib import cm, rcParams
 from matplotlib import pyplot as plt
 from matplotlib.testing.decorators import image_comparison, knownfailureif, cleanup
-import os
+
 
 if 'TRAVIS' not in os.environ:
     @image_comparison(baseline_images=['pdf_use14corefonts'], extensions=['pdf'])
@@ -30,11 +31,17 @@ def test_use14corefonts():
                  fontsize=24)
         plt.axhline(0.5, linewidth=0.5)
 
+
 @cleanup
 def test_type42():
     rcParams['pdf.fonttype'] = 42
 
     fig = plt.figure()
     ax = fig.add_subplot(111)
-    ax.plot([1,2,3])
+    ax.plot([1, 2, 3])
     fig.savefig(io.BytesIO())
+
+
+if __name__ == "__main__":
+    import nose
+    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)

lib/matplotlib/tests/test_backend_pgf.py

@@ -1,16 +1,18 @@
 # -*- encoding: utf-8 -*-
-
 import os
 import shutil
+
 import numpy as np
 import nose
 from nose.plugins.skip import SkipTest
+
 import matplotlib as mpl
 import matplotlib.pyplot as plt
 from matplotlib.compat import subprocess
 from matplotlib.testing.compare import compare_images, ImageComparisonFailure
 from matplotlib.testing.decorators import _image_directories
 
+
 baseline_dir, result_dir = _image_directories(lambda: 'dummy func')
 
 
@@ -59,19 +61,21 @@ def compare_figure(fname):
     shutil.copyfile(os.path.join(baseline_dir, fname), expected)
     err = compare_images(expected, actual, tol=14)
     if err:
-        raise ImageComparisonFailure('images not close: %s vs. %s' % (actual, expected))
+        raise ImageComparisonFailure('images not close: %s vs. '
+                                     '%s' % (actual, expected))
 
-###############################################################################
 
 def create_figure():
     plt.figure()
     x = np.linspace(0, 1, 15)
-    plt.plot(x, x**2, "b-")
+    plt.plot(x, x ** 2, "b-")
     plt.fill_between([0., .4], [.4, 0.], hatch='//', facecolor="lightgray", edgecolor="red")
-    plt.plot(x, 1-x**2, "g>")
+    plt.plot(x, 1 - x**2, "g>")
     plt.plot([0.9], [0.5], "ro", markersize=3)
-    plt.text(0.9, 0.5, u'unicode (ü, °, µ) and math ($\\mu_i = x_i^2$)', ha='right', fontsize=20)
-    plt.ylabel(u'sans-serif with math $\\frac{\\sqrt{x}}{y^2}$..', family='sans-serif')
+    plt.text(0.9, 0.5, u'unicode (ü, °, µ) and math ($\\mu_i = x_i^2$)',
+             ha='right', fontsize=20)
+    plt.ylabel(u'sans-serif with math $\\frac{\\sqrt{x}}{y^2}$..',
+               family='sans-serif')
 
 
 # test compiling a figure to pdf with xelatex
@@ -81,7 +85,7 @@ def test_xelatex():
         raise SkipTest('xelatex + pgf is required')
 
     rc_xelatex = {'font.family': 'serif',
-                   'pgf.rcfonts': False,}
+                  'pgf.rcfonts': False}
     mpl.rcParams.update(rc_xelatex)
     create_figure()
     compare_figure('pgf_xelatex.pdf')
@@ -129,7 +133,7 @@ def test_rcupdate():
     for i, rc_set in enumerate(rc_sets):
         mpl.rcParams.update(rc_set)
         create_figure()
-        compare_figure('pgf_rcupdate%d.pdf' % (i+1))
+        compare_figure('pgf_rcupdate%d.pdf' % (i + 1))
 
 
 # test backend-side clipping, since large numbers are not supported by TeX
@@ -160,4 +164,4 @@ def test_mixedmode():
 
 if __name__ == '__main__':
     import nose
-    nose.runmodule(argv=['-s','--with-doctest'], exit=False)
+    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)

lib/matplotlib/tests/test_backend_svg.py

@@ -1,43 +1,49 @@
 from __future__ import print_function
-import matplotlib.pyplot as plt
-import numpy as np
-import sys
 from io import BytesIO
 import xml.parsers.expat
-from matplotlib.testing.decorators import knownfailureif, cleanup
+
+import numpy as np
+
+import matplotlib.pyplot as plt
+from matplotlib.testing.decorators import cleanup
 from matplotlib.testing.decorators import image_comparison
 
+
 @cleanup
 def test_visibility():
-    # This is SF 2856495. See
-    # https://sourceforge.net/tracker/?func=detail&aid=2856495&group_id=80706&atid=560720
-    fig=plt.figure()
-    ax=fig.add_subplot(1,1,1)
+    fig = plt.figure()
+    ax = fig.add_subplot(111)
 
-    x = np.linspace(0,4*np.pi,50)
+    x = np.linspace(0, 4 * np.pi, 50)
     y = np.sin(x)
     yerr = np.ones_like(y)
 
-    a,b,c=ax.errorbar(x,y,yerr=yerr,fmt='ko')
+    a, b, c = ax.errorbar(x, y, yerr=yerr, fmt='ko')
     for artist in b:
         artist.set_visible(False)
 
     fd = BytesIO()
-    fig.savefig(fd,format='svg')
+    fig.savefig(fd, format='svg')
 
     fd.seek(0)
     buf = fd.read()
     fd.close()
 
     parser = xml.parsers.expat.ParserCreate()
-    parser.Parse(buf) # this will raise ExpatError if the svg is invalid
+    parser.Parse(buf)  # this will raise ExpatError if the svg is invalid
+
 
 @image_comparison(baseline_images=['noscale'], remove_text=True)
 def test_noscale():
     X, Y = np.meshgrid(np.arange(-5, 5, 1), np.arange(-5, 5, 1))
-    Z = np.sin(Y**2)
+    Z = np.sin(Y ** 2)
 
     fig = plt.figure()
     ax = fig.add_subplot(1, 1, 1)
     ax.imshow(Z, cmap='gray')
     plt.rcParams['svg.image_noscale'] = True
+
+
+if __name__ == '__main__':
+    import nose
+    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)

lib/matplotlib/tests/test_basic.py

@@ -1,16 +1,21 @@
 from __future__ import print_function
+
 from nose.tools import assert_equal
+
 from matplotlib.testing.decorators import knownfailureif
-import sys
+from pylab import *
+
 
 def test_simple():
-    assert_equal(1+1,2)
+    assert_equal(1 + 1, 2)
+
 
 @knownfailureif(True)
 def test_simple_knownfail():
-    assert_equal(1+1,3)
+    # Test the known fail mechanism.
+    assert_equal(1 + 1, 3)
+
 
-from pylab import *
 def test_override_builtins():
     ok_to_override = set([
         '__name__',
@@ -21,7 +26,6 @@ def test_override_builtins():
         'all',
         'sum'
     ])
-
     if sys.version_info[0] >= 3:
         builtins = sys.modules['builtins']
     else:
@@ -31,8 +35,13 @@ def test_override_builtins():
     for key in globals().keys():
         if key in dir(builtins):
             if (globals()[key] != getattr(builtins, key) and
-                key not in ok_to_override):
+                    key not in ok_to_override):
                 print("'%s' was overridden in globals()." % key)
                 overridden = True
 
     assert not overridden
+
+
+if __name__ == '__main__':
+    import nose
+    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)