Additional example cleanup

tonysyu · tonysyu · commit dd4c147ef9a9 · 2012-01-01T12:02:10.000-05:00
* For examples that are meant to be imported, move pyplot import to an if-main block

* Remove some unused imports
diff --git a/examples/api/clippath_demo.py b/examples/api/clippath_demo.py
@@ -3,7 +3,6 @@
 """
 import numpy as np
 import matplotlib.pyplot as plt
-import matplotlib.path as path
 import matplotlib.patches as patches
 
 
diff --git a/examples/api/custom_projection_example.py b/examples/api/custom_projection_example.py
@@ -1,9 +1,9 @@
 from __future__ import unicode_literals
 
-import matplotlib.pyplot as plt
 from matplotlib.axes import Axes
 from matplotlib.patches import Circle
 from matplotlib.path import Path
+from matplotlib.ticker import NullLocator, Formatter, FixedLocator
 from matplotlib.transforms import Affine2D, BboxTransformTo, Transform
 from matplotlib.projections import register_projection
 import matplotlib.spines as mspines
@@ -55,8 +55,8 @@ def cla(self):
         self.set_longitude_grid_ends(75)
 
         # Turn off minor ticking altogether
-        self.xaxis.set_minor_locator(plt.NullLocator())
-        self.yaxis.set_minor_locator(plt.NullLocator())
+        self.xaxis.set_minor_locator(NullLocator())
+        self.yaxis.set_minor_locator(NullLocator())
 
         # Do not display ticks -- we only want gridlines and text
         self.xaxis.set_ticks_position('none')
@@ -282,7 +282,7 @@ def format_coord(self, long, lat):
         # \u00b0 : degree symbol
         return '%f\u00b0%s, %f\u00b0%s' % (abs(lat), ns, abs(long), ew)
 
-    class DegreeFormatter(plt.Formatter):
+    class DegreeFormatter(Formatter):
         """
         This is a custom formatter that converts the native unit of
         radians into (truncated) degrees and adds a degree symbol.
@@ -326,7 +326,7 @@ class -- it provides a more convenient interface than
         # by degrees.
         number = (180.0 / degrees) + 1
         self.yaxis.set_major_locator(
-            plt.FixedLocator(
+            FixedLocator(
                 np.linspace(-np.pi / 2.0, np.pi / 2.0, number, True)[1:-1]))
         # Set the formatter to display the tick labels in degrees,
         # rather than radians.
@@ -446,10 +446,12 @@ def inverted(self):
 # it.
 register_projection(HammerAxes)
 
-# Now make a simple example using the custom projection.
-plt.subplot(111, projection="custom_hammer")
-p = plt.plot([-1, 1, 1], [-1, -1, 1], "o-")
-plt.grid(True)
+if __name__ == '__main__':
+    import matplotlib.pyplot as plt
+    # Now make a simple example using the custom projection.
+    plt.subplot(111, projection="custom_hammer")
+    p = plt.plot([-1, 1, 1], [-1, -1, 1], "o-")
+    plt.grid(True)
 
-plt.show()
+    plt.show()
 
diff --git a/examples/api/custom_scale_example.py b/examples/api/custom_scale_example.py
@@ -2,9 +2,9 @@
 
 import numpy as np
 from numpy import ma
-import matplotlib.pyplot as plt
 from matplotlib import scale as mscale
 from matplotlib import transforms as mtransforms
+from matplotlib.ticker import Formatter, FixedLocator
 
 
 class MercatorLatitudeScale(mscale.ScaleBase):
@@ -70,13 +70,13 @@ def set_default_locators_and_formatters(self, axis):
         the radians to degrees and put a degree symbol after the
         value::
         """
-        class DegreeFormatter(plt.Formatter):
+        class DegreeFormatter(Formatter):
             def __call__(self, x, pos=None):
                 # \u00b0 : degree symbol
                 return "%d\u00b0" % ((x / np.pi) * 180.0)
 
         deg2rad = np.pi / 180.0
-        axis.set_major_locator(plt.FixedLocator(
+        axis.set_major_locator(FixedLocator(
                 np.arange(-90, 90, 10) * deg2rad))
         axis.set_major_formatter(DegreeFormatter())
         axis.set_minor_formatter(DegreeFormatter())
@@ -154,16 +154,20 @@ def inverted(self):
 # that ``matplotlib`` can find it.
 mscale.register_scale(MercatorLatitudeScale)
 
-t = np.arange(-180.0, 180.0, 0.1)
-s = t / 360.0 * np.pi
 
-plt.plot(t, s, '-', lw=2)
-plt.gca().set_yscale('mercator')
+if __name__ == '__main__':
+    import matplotlib.pyplot as plt
 
-plt.xlabel('Longitude')
-plt.ylabel('Latitude')
-plt.title('Mercator: Projection of the Oppressor')
-plt.grid(True)
+    t = np.arange(-180.0, 180.0, 0.1)
+    s = t / 360.0 * np.pi
 
-plt.show()
+    plt.plot(t, s, '-', lw=2)
+    plt.gca().set_yscale('mercator')
+
+    plt.xlabel('Longitude')
+    plt.ylabel('Latitude')
+    plt.title('Mercator: Projection of the Oppressor')
+    plt.grid(True)
+
+    plt.show()
 
diff --git a/examples/api/date_demo.py b/examples/api/date_demo.py
@@ -13,10 +13,8 @@
 """
 import datetime
 import numpy as np
-import matplotlib
 import matplotlib.pyplot as plt
 import matplotlib.dates as mdates
-import matplotlib.mlab as mlab
 import matplotlib.cbook as cbook
 
 years    = mdates.YearLocator()   # every year
diff --git a/examples/api/sankey_demo_old.py b/examples/api/sankey_demo_old.py
@@ -168,15 +168,15 @@ def put_labels(labels,positions,output=True):
 
 if __name__=='__main__':
 
-    import matplotlib.pyplot as P
+    import matplotlib.pyplot as plt
 
     outputs = [10.,-20.,5.,15.,-10.,40.]
     outlabels = ['First','Second','Third','Fourth','Fifth','Hurray!']
     outlabels = [ s+'\n%d%%' % abs(l) for l,s in zip(outputs,outlabels) ]
 
     inputs = [60.,-25.,15.]
 
-    fig = P.figure()
+    fig = plt.figure()
     ax = fig.add_subplot(1,1,1, xticks=[],yticks=[],
                          title="Sankey diagram"
                          )
@@ -187,5 +187,5 @@ def put_labels(labels,positions,output=True):
     outtexts[1].set_color('r')
     outtexts[-1].set_fontweight('bold')
 
-    P.show()
+    plt.show()
 
diff --git a/examples/event_handling/data_browser.py b/examples/event_handling/data_browser.py
@@ -1,17 +1,6 @@
 import numpy as np
-import matplotlib.pyplot as plt
 
 
-X = np.random.rand(100, 200)
-xs = np.mean(X, axis=1)
-ys = np.std(X, axis=1)
-
-fig = plt.figure()
-ax = fig.add_subplot(211)
-ax.set_title('click on point to plot time series')
-line, = ax.plot(xs, ys, 'o', picker=5)  # 5 points tolerance
-ax2 = fig.add_subplot(212)
-
 class PointBrowser:
     """
     Click on a point to select and highlight it -- the data that
@@ -74,9 +63,23 @@ def update(self):
         fig.canvas.draw()
 
 
-browser = PointBrowser()
+if __name__ == '__main__':
+    import matplotlib.pyplot as plt
+
+    X = np.random.rand(100, 200)
+    xs = np.mean(X, axis=1)
+    ys = np.std(X, axis=1)
+
+    fig = plt.figure()
+    ax = fig.add_subplot(211)
+    ax.set_title('click on point to plot time series')
+    line, = ax.plot(xs, ys, 'o', picker=5)  # 5 points tolerance
+    ax2 = fig.add_subplot(212)
+
+    browser = PointBrowser()
+
+    fig.canvas.mpl_connect('pick_event', browser.onpick)
+    fig.canvas.mpl_connect('key_press_event', browser.onpress)
 
-fig.canvas.mpl_connect('pick_event', browser.onpick)
-fig.canvas.mpl_connect('key_press_event', browser.onpress)
+    plt.show()
 
-plt.show()
diff --git a/examples/event_handling/pick_event_demo.py b/examples/event_handling/pick_event_demo.py
@@ -67,7 +67,7 @@ def pick_handler(event):
 from __future__ import print_function
 from matplotlib.pyplot import figure, show
 from matplotlib.lines import Line2D
-from matplotlib.patches import Patch, Rectangle
+from matplotlib.patches import Rectangle
 from matplotlib.text import Text
 from matplotlib.image import AxesImage
 import numpy as np
diff --git a/examples/event_handling/poly_editor.py b/examples/event_handling/poly_editor.py
@@ -4,9 +4,8 @@
 
 """
 import numpy as np
-import matplotlib.pyplot as plt
+from matplotlib.lines import Line2D
 from matplotlib.artist import Artist
-from matplotlib.patches import Polygon
 from matplotlib.mlab import dist_point_to_segment
 
 
@@ -37,8 +36,7 @@ def __init__(self, ax, poly):
         self.poly = poly
 
         x, y = zip(*self.poly.xy)
-        self.line = plt.Line2D(x, y, marker='o', markerfacecolor='r',
-                               animated=True)
+        self.line = Line2D(x, y, marker='o', markerfacecolor='r', animated=True)
         self.ax.add_line(self.line)
         #self._update_line(poly)
 
@@ -143,22 +141,26 @@ def motion_notify_callback(self, event):
         self.canvas.blit(self.ax.bbox)
 
 
-fig = plt.figure()
-theta = np.arange(0, 2*np.pi, 0.1)
-r = 1.5
+if __name__ == '__main__':
+    import matplotlib.pyplot as plt
+    from matplotlib.patches import Polygon
 
-xs = r*np.cos(theta)
-ys = r*np.sin(theta)
+    fig = plt.figure()
+    theta = np.arange(0, 2*np.pi, 0.1)
+    r = 1.5
 
-poly = Polygon(zip(xs, ys,), animated=True)
+    xs = r*np.cos(theta)
+    ys = r*np.sin(theta)
 
-ax = plt.subplot(111)
-ax.add_patch(poly)
-p = PolygonInteractor(ax, poly)
+    poly = Polygon(zip(xs, ys,), animated=True)
 
-#ax.add_line(p.line)
-ax.set_title('Click and drag a point to move it')
-ax.set_xlim((-2,2))
-ax.set_ylim((-2,2))
-plt.show()
+    ax = plt.subplot(111)
+    ax.add_patch(poly)
+    p = PolygonInteractor(ax, poly)
+
+    #ax.add_line(p.line)
+    ax.set_title('Click and drag a point to move it')
+    ax.set_xlim((-2,2))
+    ax.set_ylim((-2,2))
+    plt.show()
 
