Merge pull request #11674 from anntzer/style

jklymak · web-flow · commit 118c8525281f · 2018-07-16T09:29:01.000-07:00
Boring style fixes.
diff --git a/.flake8 b/.flake8
@@ -54,9 +54,8 @@ per-file-ignores =
     matplotlib/sphinxext/mathmpl.py: E302
     matplotlib/sphinxext/only_directives.py: E302
     matplotlib/sphinxext/plot_directive.py: E261, E302, E402
-    matplotlib/tests/test_image.py: E225, E231, E251, E302, E501
-    matplotlib/tests/test_lines.py: E231, E261
-    matplotlib/tests/test_mathtext.py: E261, E501
+    matplotlib/tests/test_image.py: E231
+    matplotlib/tests/test_mathtext.py: E501
     matplotlib/transforms.py: E201, E202, E203, E501
     matplotlib/tri/triinterpolate.py: E201, E221
     matplotlib/type1font.py: E731
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -205,6 +205,7 @@ def test_image_alpha():
     plt.subplot(133)
     plt.imshow(Z, alpha=0.5, interpolation='nearest')
 
+
 def test_cursor_data():
     from matplotlib.backend_bases import MouseEvent
 
@@ -286,7 +287,8 @@ def test_image_cliprect():
 
     im = ax.imshow(d, extent=(0,5,0,5))
 
-    rect = patches.Rectangle(xy=(1,1), width=2, height=2, transform=im.axes.transData)
+    rect = patches.Rectangle(
+        xy=(1,1), width=2, height=2, transform=im.axes.transData)
     im.set_clip_path(rect)
 
 
@@ -302,23 +304,20 @@ def test_imshow():
 @image_comparison(baseline_images=['no_interpolation_origin'],
                   remove_text=True)
 def test_no_interpolation_origin():
-    fig = plt.figure()
-    ax = fig.add_subplot(211)
-    ax.imshow(np.arange(100).reshape((2, 50)), origin="lower",
-              interpolation='none')
-
-    ax = fig.add_subplot(212)
-    ax.imshow(np.arange(100).reshape((2, 50)), interpolation='none')
+    fig, axs = plt.subplots(2)
+    axs[0].imshow(np.arange(100).reshape((2, 50)), origin="lower",
+                  interpolation='none')
+    axs[1].imshow(np.arange(100).reshape((2, 50)), interpolation='none')
 
 
 @image_comparison(baseline_images=['image_shift'], remove_text=True,
                   extensions=['pdf', 'svg'])
 def test_image_shift():
     from matplotlib.colors import LogNorm
 
-    imgData = [[1.0/(x) + 1.0/(y) for x in range(1,100)] for y in range(1,100)]
-    tMin=734717.945208
-    tMax=734717.946366
+    imgData = [[1 / x + 1 / y for x in range(1, 100)] for y in range(1, 100)]
+    tMin = 734717.945208
+    tMax = 734717.946366
 
     fig, ax = plt.subplots()
     ax.imshow(imgData, norm=LogNorm(), interpolation='none',
@@ -376,11 +375,13 @@ def test_image_composite_alpha():
     fig, ax = plt.subplots()
     arr = np.zeros((11, 21, 4))
     arr[:, :, 0] = 1
-    arr[:, :, 3] = np.concatenate((np.arange(0, 1.1, 0.1), np.arange(0, 1, 0.1)[::-1]))
+    arr[:, :, 3] = np.concatenate(
+        (np.arange(0, 1.1, 0.1), np.arange(0, 1, 0.1)[::-1]))
     arr2 = np.zeros((21, 11, 4))
     arr2[:, :, 0] = 1
     arr2[:, :, 1] = 1
-    arr2[:, :, 3] = np.concatenate((np.arange(0, 1.1, 0.1), np.arange(0, 1, 0.1)[::-1]))[:, np.newaxis]
+    arr2[:, :, 3] = np.concatenate(
+        (np.arange(0, 1.1, 0.1), np.arange(0, 1, 0.1)[::-1]))[:, np.newaxis]
     ax.imshow(arr, extent=[1, 2, 5, 0], alpha=0.3)
     ax.imshow(arr, extent=[2, 3, 5, 0], alpha=0.6)
     ax.imshow(arr, extent=[3, 4, 5, 0])
@@ -397,21 +398,22 @@ def test_image_composite_alpha():
                   remove_text=True, style='mpl20')
 def test_rasterize_dpi():
     # This test should check rasterized rendering with high output resolution.
-    # It plots a rasterized line and a normal image with implot. So it will catch
-    # when images end up in the wrong place in case of non-standard dpi setting.
-    # Instead of high-res rasterization i use low-res.  Therefore the fact that the
-    # resolution is non-standard is easily checked by image_comparison.
+    # It plots a rasterized line and a normal image with implot.  So it will
+    # catch when images end up in the wrong place in case of non-standard dpi
+    # setting.  Instead of high-res rasterization I use low-res.  Therefore
+    # the fact that the resolution is non-standard is easily checked by
+    # image_comparison.
     img = np.asarray([[1, 2], [3, 4]])
 
-    fig, axes = plt.subplots(1, 3, figsize = (3, 1))
+    fig, axes = plt.subplots(1, 3, figsize=(3, 1))
 
     axes[0].imshow(img)
 
-    axes[1].plot([0,1],[0,1], linewidth=20., rasterized=True)
-    axes[1].set(xlim = (0,1), ylim = (-1, 2))
+    axes[1].plot([0,1], [0,1], linewidth=20., rasterized=True)
+    axes[1].set(xlim=(0, 1), ylim=(-1, 2))
 
-    axes[2].plot([0,1],[0,1], linewidth=20.)
-    axes[2].set(xlim = (0,1), ylim = (-1, 2))
+    axes[2].plot([0,1], [0,1], linewidth=20.)
+    axes[2].set(xlim=(0, 1), ylim=(-1, 2))
 
     # Low-dpi PDF rasterization errors prevent proper image comparison tests.
     # Hide detailed structures like the axes spines.
@@ -441,8 +443,8 @@ def test_bbox_image_inverted():
 
     image = np.identity(10)
 
-    bbox_im = BboxImage(
-        TransformedBbox(Bbox([[0.1, 0.2], [0.3, 0.25]]), ax.figure.transFigure))
+    bbox_im = BboxImage(TransformedBbox(Bbox([[0.1, 0.2], [0.3, 0.25]]),
+                                        ax.figure.transFigure))
     bbox_im.set_data(image)
     bbox_im.set_clip_on(False)
     ax.add_artist(bbox_im)
@@ -459,7 +461,8 @@ def test_get_window_extent_for_AxisImage():
     ax.set_position([0, 0, 1, 1])
     ax.set_xlim(0, 1)
     ax.set_ylim(0, 1)
-    im_obj = ax.imshow(im, extent=[0.4, 0.7, 0.2, 0.9], interpolation='nearest')
+    im_obj = ax.imshow(
+        im, extent=[0.4, 0.7, 0.2, 0.9], interpolation='nearest')
 
     fig.canvas.draw()
     renderer = fig.canvas.renderer
diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
@@ -32,15 +32,15 @@ def test_invisible_Line_rendering():
     """
     # Creates big x and y data:
     N = 10**7
-    x = np.linspace(0,1,N)
+    x = np.linspace(0, 1, N)
     y = np.random.normal(size=N)
 
     # Create a plot figure:
     fig = plt.figure()
     ax = plt.subplot(111)
 
     # Create a "big" Line instance:
-    l = mlines.Line2D(x,y)
+    l = mlines.Line2D(x, y)
     l.set_visible(False)
     # but don't add it to the Axis instance `ax`
 
@@ -58,7 +58,7 @@ def test_invisible_Line_rendering():
     # gives about 290 ms for N = 10**7 pts
 
     slowdown_factor = (t_unvisible_line/t_no_line)
-    slowdown_threshold = 2 # trying to avoid false positive failures
+    slowdown_threshold = 2  # trying to avoid false positive failures
     assert slowdown_factor < slowdown_threshold
 
 
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
@@ -55,7 +55,7 @@
     '$\\alpha \\beta \\gamma \\delta \\epsilon \\zeta \\eta \\theta \\iota \\lambda \\mu \\nu \\xi \\pi \\kappa \\rho \\sigma \\tau \\upsilon \\phi \\chi \\psi$',
 
     # The examples prefixed by 'mmltt' are from the MathML torture test here:
-        # http://www.mozilla.org/projects/mathml/demo/texvsmml.xhtml
+    # http://www.mozilla.org/projects/mathml/demo/texvsmml.xhtml
     r'${x}^{2}{y}^{2}$',
     r'${}_{2}F_{3}$',
     r'$\frac{x+{y}^{2}}{k+1}$',
@@ -87,26 +87,26 @@
     r'${x}_{92}^{31415}+\pi $',
     r'${x}_{{y}_{b}^{a}}^{{z}_{c}^{d}}$',
     r'${y}_{3}^{\prime \prime \prime }$',
-    r"$\left( \xi \left( 1 - \xi \right) \right)$", # Bug 2969451
-    r"$\left(2 \, a=b\right)$", # Sage bug #8125
-    r"$? ! &$", # github issue #466
-    r'$\operatorname{cos} x$', # github issue #553
+    r"$\left( \xi \left( 1 - \xi \right) \right)$",  # Bug 2969451
+    r"$\left(2 \, a=b\right)$",  # Sage bug #8125
+    r"$? ! &$",  # github issue #466
+    r'$\operatorname{cos} x$',  # github issue #553
     r'$\sum _{\genfrac{}{}{0}{}{0\leq i\leq m}{0<j<n}}P\left(i,j\right)$',
     r"$\left\Vert a \right\Vert \left\vert b \right\vert \left| a \right| \left\| b\right\| \Vert a \Vert \vert b \vert$",
     r'$\mathring{A}  \stackrel{\circ}{A}  \AA$',
     r'$M \, M \thinspace M \/ M \> M \: M \; M \ M \enspace M \quad M \qquad M \! M$',
     r'$\Cup$ $\Cap$ $\leftharpoonup$ $\barwedge$ $\rightharpoonup$',
     r'$\dotplus$ $\doteq$ $\doteqdot$ $\ddots$',
-    r'$xyz^kx_kx^py^{p-2} d_i^jb_jc_kd x^j_i E^0 E^0_u$', # github issue #4873
+    r'$xyz^kx_kx^py^{p-2} d_i^jb_jc_kd x^j_i E^0 E^0_u$',  # github issue #4873
     r'${xyz}^k{x}_{k}{x}^{p}{y}^{p-2} {d}_{i}^{j}{b}_{j}{c}_{k}{d} {x}^{j}_{i}{E}^{0}{E}^0_u$',
     r'${\int}_x^x x\oint_x^x x\int_{X}^{X}x\int_x x \int^x x \int_{x} x\int^{x}{\int}_{x} x{\int}^{x}_{x}x$',
     r'testing$^{123}$',
     ' '.join('$\\' + p + '$' for p in sorted(mathtext.Parser._snowflake)),
     r'$6-2$; $-2$; $ -2$; ${-2}$; ${  -2}$; $20^{+3}_{-2}$',
-    r'$\overline{\omega}^x \frac{1}{2}_0^x$', # github issue #5444
-    r'$,$ $.$ $1{,}234{, }567{ , }890$ and $1,234,567,890$', # github issue 5799
-    r'$\left(X\right)_{a}^{b}$', # github issue 7615
-    r'$\dfrac{\$100.00}{y}$', # github issue #1888
+    r'$\overline{\omega}^x \frac{1}{2}_0^x$',  # github issue #5444
+    r'$,$ $.$ $1{,}234{, }567{ , }890$ and $1,234,567,890$',  # github issue 5799
+    r'$\left(X\right)_{a}^{b}$',  # github issue 7615
+    r'$\dfrac{\$100.00}{y}$',  # github issue #1888
 ]
 
 digits = "0123456789"
