Pylab moves an cleans

dstansby · dstansby · commit caff8e208183 · 2017-07-23T21:51:58.000+01:00
diff --git a/examples/pie_and_polar_charts/pie_demo2.py b/examples/pie_and_polar_charts/pie_demo2.py
@@ -4,7 +4,8 @@
 =========
 
 Make a pie charts of varying size - see
-http://matplotlib.org/api/pyplot_api.html#matplotlib.pyplot.pie for the docstring.
+http://matplotlib.org/api/pyplot_api.html#matplotlib.pyplot.pie for the
+docstring.
 
 This example shows a basic pie charts with labels optional features,
 like autolabeling the percentage, offsetting a slice with "explode"
diff --git a/examples/pie_and_polar_charts/polar_legend.py b/examples/pie_and_polar_charts/polar_legend.py
@@ -19,9 +19,9 @@
                   projection='polar', facecolor='#d5de9c')
 
 r = np.arange(0, 3.0, 0.01)
-theta = 2*np.pi*r
+theta = 2 * np.pi * r
 ax.plot(theta, r, color='#ee8d18', lw=3, label='a line')
-ax.plot(0.5*theta, r, color='blue', ls='--', lw=3, label='another line')
+ax.plot(0.5 * theta, r, color='blue', ls='--', lw=3, label='another line')
 ax.legend()
 
 show()
diff --git a/examples/scales/log_bar.py b/examples/scales/log_bar.py
@@ -3,26 +3,24 @@
 Log Bar
 =======
 
+Plotting a bar chart with a logarithmic y-axis.
 """
 import matplotlib.pyplot as plt
 import numpy as np
 
 data = ((3, 1000), (10, 3), (100, 30), (500, 800), (50, 1))
 
-plt.xlabel("FOO")
-plt.ylabel("FOO")
-plt.title("Testing")
-plt.yscale('log')
-
 dim = len(data[0])
 w = 0.75
 dimw = w / dim
 
+fig, ax = plt.subplots()
 x = np.arange(len(data))
 for i in range(len(data[0])):
     y = [d[i] for d in data]
-    b = plt.bar(x + i * dimw, y, dimw, bottom=0.001)
+    b = ax.bar(x + i * dimw, y, dimw, bottom=0.001)
 
-plt.xticks(x + dimw / 2, map(str, x))
+ax.set_xticks(x + dimw / 2, map(str, x))
+ax.set_yscale('log')
 
 plt.show()
diff --git a/examples/scales/log_test.py b/examples/scales/log_test.py
diff --git a/examples/shapes_and_collections/ellipse_collection.py b/examples/shapes_and_collections/ellipse_collection.py
@@ -14,9 +14,9 @@
 
 XY = np.hstack((X.ravel()[:, np.newaxis], Y.ravel()[:, np.newaxis]))
 
-ww = X/10.0
-hh = Y/15.0
-aa = X*9
+ww = X / 10.0
+hh = Y / 15.0
+aa = X * 9
 
 
 fig, ax = plt.subplots()
diff --git a/examples/shapes_and_collections/ellipse_rotated.py b/examples/shapes_and_collections/ellipse_rotated.py
diff --git a/examples/specialty_plots/leftventricle_bulleye.py b/examples/specialty_plots/leftventricle_bulleye.py
@@ -54,7 +54,7 @@ def bullseye_plot(ax, data, segBold=None, cmap=None, norm=None):
     if norm is None:
         norm = mpl.colors.Normalize(vmin=data.min(), vmax=data.max())
 
-    theta = np.linspace(0, 2*np.pi, 768)
+    theta = np.linspace(0, 2 * np.pi, 768)
     r = np.linspace(0.2, 1, 4)
 
     # Create the bound for the segment 17
@@ -76,52 +76,52 @@ def bullseye_plot(ax, data, segBold=None, cmap=None, norm=None):
     r0 = np.repeat(r0[:, np.newaxis], 128, axis=1).T
     for i in range(6):
         # First segment start at 60 degrees
-        theta0 = theta[i*128:i*128+128] + np.deg2rad(60)
+        theta0 = theta[i * 128:i * 128 + 128] + np.deg2rad(60)
         theta0 = np.repeat(theta0[:, np.newaxis], 2, axis=1)
-        z = np.ones((128, 2))*data[i]
+        z = np.ones((128, 2)) * data[i]
         ax.pcolormesh(theta0, r0, z, cmap=cmap, norm=norm)
-        if i+1 in segBold:
-            ax.plot(theta0, r0, '-k', lw=linewidth+2)
-            ax.plot(theta0[0], [r[2], r[3]], '-k', lw=linewidth+1)
-            ax.plot(theta0[-1], [r[2], r[3]], '-k', lw=linewidth+1)
+        if i + 1 in segBold:
+            ax.plot(theta0, r0, '-k', lw=linewidth + 2)
+            ax.plot(theta0[0], [r[2], r[3]], '-k', lw=linewidth + 1)
+            ax.plot(theta0[-1], [r[2], r[3]], '-k', lw=linewidth + 1)
 
     # Fill the segments 7-12
     r0 = r[1:3]
     r0 = np.repeat(r0[:, np.newaxis], 128, axis=1).T
     for i in range(6):
         # First segment start at 60 degrees
-        theta0 = theta[i*128:i*128+128] + np.deg2rad(60)
+        theta0 = theta[i * 128:i * 128 + 128] + np.deg2rad(60)
         theta0 = np.repeat(theta0[:, np.newaxis], 2, axis=1)
-        z = np.ones((128, 2))*data[i+6]
+        z = np.ones((128, 2)) * data[i + 6]
         ax.pcolormesh(theta0, r0, z, cmap=cmap, norm=norm)
-        if i+7 in segBold:
-            ax.plot(theta0, r0, '-k', lw=linewidth+2)
-            ax.plot(theta0[0], [r[1], r[2]], '-k', lw=linewidth+1)
-            ax.plot(theta0[-1], [r[1], r[2]], '-k', lw=linewidth+1)
+        if i + 7 in segBold:
+            ax.plot(theta0, r0, '-k', lw=linewidth + 2)
+            ax.plot(theta0[0], [r[1], r[2]], '-k', lw=linewidth + 1)
+            ax.plot(theta0[-1], [r[1], r[2]], '-k', lw=linewidth + 1)
 
     # Fill the segments 13-16
     r0 = r[0:2]
     r0 = np.repeat(r0[:, np.newaxis], 192, axis=1).T
     for i in range(4):
         # First segment start at 45 degrees
-        theta0 = theta[i*192:i*192+192] + np.deg2rad(45)
+        theta0 = theta[i * 192:i * 192 + 192] + np.deg2rad(45)
         theta0 = np.repeat(theta0[:, np.newaxis], 2, axis=1)
-        z = np.ones((192, 2))*data[i+12]
+        z = np.ones((192, 2)) * data[i + 12]
         ax.pcolormesh(theta0, r0, z, cmap=cmap, norm=norm)
-        if i+13 in segBold:
-            ax.plot(theta0, r0, '-k', lw=linewidth+2)
-            ax.plot(theta0[0], [r[0], r[1]], '-k', lw=linewidth+1)
-            ax.plot(theta0[-1], [r[0], r[1]], '-k', lw=linewidth+1)
+        if i + 13 in segBold:
+            ax.plot(theta0, r0, '-k', lw=linewidth + 2)
+            ax.plot(theta0[0], [r[0], r[1]], '-k', lw=linewidth + 1)
+            ax.plot(theta0[-1], [r[0], r[1]], '-k', lw=linewidth + 1)
 
     # Fill the segments 17
     if data.size == 17:
         r0 = np.array([0, r[0]])
         r0 = np.repeat(r0[:, np.newaxis], theta.size, axis=1).T
         theta0 = np.repeat(theta[:, np.newaxis], 2, axis=1)
-        z = np.ones((theta.size, 2))*data[16]
+        z = np.ones((theta.size, 2)) * data[16]
         ax.pcolormesh(theta0, r0, z, cmap=cmap, norm=norm)
         if 17 in segBold:
-            ax.plot(theta0, r0, '-k', lw=linewidth+2)
+            ax.plot(theta0, r0, '-k', lw=linewidth + 2)
 
     ax.set_ylim([0, 1])
     ax.set_yticklabels([])
@@ -188,7 +188,7 @@ def bullseye_plot(ax, data, segBold=None, cmap=None, norm=None):
 cb3 = mpl.colorbar.ColorbarBase(axl3, cmap=cmap3, norm=norm3,
                                 # to use 'extend', you must
                                 # specify two extra boundaries:
-                                boundaries=[0]+bounds+[18],
+                                boundaries=[0] + bounds + [18],
                                 extend='both',
                                 ticks=bounds,  # optional
                                 spacing='proportional',
diff --git a/examples/specialty_plots/mri_demo.py b/examples/specialty_plots/mri_demo.py
diff --git a/examples/specialty_plots/mri_with_eeg.py b/examples/specialty_plots/mri_with_eeg.py
diff --git a/examples/text_labels_and_annotations/figlegend_demo.py b/examples/text_labels_and_annotations/figlegend_demo.py
@@ -13,12 +13,12 @@
 fig, axs = plt.subplots(1, 2)
 
 x = np.arange(0.0, 2.0, 0.02)
-y1 = np.sin(2*np.pi*x)
+y1 = np.sin(2 * np.pi * x)
 y2 = np.exp(-x)
 l1, l2 = axs[0].plot(x, y1, 'rs-', x, y2, 'go')
 
-y3 = np.sin(4*np.pi*x)
-y4 = np.exp(-2*x)
+y3 = np.sin(4 * np.pi * x)
+y4 = np.exp(-2 * x)
 l3, l4 = axs[1].plot(x, y3, 'yd-', x, y4, 'k^')
 
 fig.legend((l1, l2), ('Line 1', 'Line 2'), 'upper left')
diff --git a/examples/text_labels_and_annotations/usetex_fonteffects.py b/examples/text_labels_and_annotations/usetex_fonteffects.py
@@ -15,8 +15,10 @@
 def setfont(font):
     return r'\font\a %s at 14pt\a ' % font
 
+
 for y, font, text in zip(range(5),
-                         ['ptmr8r', 'ptmri8r', 'ptmro8r', 'ptmr8rn', 'ptmrr8re'],
+                         ['ptmr8r', 'ptmri8r', 'ptmro8r',
+                          'ptmr8rn', 'ptmrr8re'],
                          ['Nimbus Roman No9 L ' + x for x in
                           ['', 'Italics (real italics for comparison)',
                            '(slanted)', '(condensed)', '(extended)']]):
diff --git a/examples/ticks_and_spines/major_minor_demo.py b/examples/ticks_and_spines/major_minor_demo.py
@@ -44,7 +44,7 @@
 
 
 t = np.arange(0.0, 100.0, 0.1)
-s = np.sin(0.1*np.pi*t)*np.exp(-t*0.01)
+s = np.sin(0.1 * np.pi * t) * np.exp(-t * 0.01)
 
 fig, ax = plt.subplots()
 ax.plot(t, s)
@@ -73,7 +73,7 @@
 
 
 t = np.arange(0.0, 100.0, 0.01)
-s = np.sin(2*np.pi*t)*np.exp(-t*0.01)
+s = np.sin(2 * np.pi * t) * np.exp(-t * 0.01)
 
 fig, ax = plt.subplots()
 ax.plot(t, s)
