Miscellaneous fixes to get examples running under Python 3.x

Author: cgohlke

examples/animation/simple_3danim.py

@@ -15,7 +15,7 @@ def Gen_RandLine(length, dims=2) :
     """
     lineData = np.empty((dims, length))
     lineData[:, 0] = np.random.rand(1, dims)
-    for index in xrange(1, length) :
+    for index in range(1, length) :
         # scaling the random numbers by 0.1 so
         # movement is small compared to position.
         # subtraction by 0.5 is to change the range to [-0.5, 0.5]
@@ -37,7 +37,7 @@ def update_lines(num, dataLines, lines) :
 ax = p3.Axes3D(fig)
 
 # Fifty lines of random 3-D lines
-data = [Gen_RandLine(25, 3) for index in xrange(50)]
+data = [Gen_RandLine(25, 3) for index in range(50)]
 
 # Creating fifty line objects.
 # NOTE: Can't pass empty arrays into 3d version of plot()

examples/api/collections_demo.py

@@ -30,13 +30,13 @@
 theta = N.array(range(nverts)) * (2*N.pi)/(nverts-1)
 xx = r * N.sin(theta)
 yy = r * N.cos(theta)
-spiral = zip(xx,yy)
+spiral = list(zip(xx,yy))
 
 # Make some offsets
 rs = N.random.RandomState([12345678])
 xo = rs.randn(npts)
 yo = rs.randn(npts)
-xyo = zip(xo, yo)
+xyo = list(zip(xo, yo))
 
 # Make a list of colors cycling through the rgbcmyk series.
 colors = [colorConverter.to_rgba(c) for c in ('r','g','b','c','y','m','k')]
@@ -114,7 +114,7 @@
 segs = []
 for i in range(ncurves):
     xxx = xx + 0.02*rs.randn(nverts)
-    curve = zip(xxx, yy*100)
+    curve = list(zip(xxx, yy*100))
     segs.append(curve)
 
 col = collections.LineCollection(segs, offsets=offs)

examples/api/scatter_piecharts.py

@@ -20,16 +20,16 @@
 # some points on a circle cos,sin
 x = [0] + np.cos(np.linspace(0, 2*math.pi*r1, 10)).tolist()
 y = [0] + np.sin(np.linspace(0, 2*math.pi*r1, 10)).tolist()
-xy1 = zip(x,y)
+xy1 = list(zip(x,y))
 
 # ...
 x = [0] + np.cos(np.linspace(2*math.pi*r1, 2*math.pi*r2, 10)).tolist()
 y = [0] + np.sin(np.linspace(2*math.pi*r1, 2*math.pi*r2, 10)).tolist()
-xy2 = zip(x,y)
+xy2 = list(zip(x,y))
 
 x = [0] + np.cos(np.linspace(2*math.pi*r2, 2*math.pi, 10)).tolist()
 y = [0] + np.sin(np.linspace(2*math.pi*r2, 2*math.pi, 10)).tolist()
-xy3 = zip(x,y)
+xy3 = list(zip(x,y))
 
 
 fig = plt.figure()

examples/mplot3d/polys3d_demo.py

@@ -15,7 +15,7 @@
 for z in zs:
     ys = np.random.rand(len(xs))
     ys[0], ys[-1] = 0, 0
-    verts.append(zip(xs, ys))
+    verts.append(list(zip(xs, ys)))
 
 poly = PolyCollection(verts, facecolors = [cc('r'), cc('g'), cc('b'),
                                            cc('y')])

examples/pylab_examples/arrow_demo.py

@@ -199,7 +199,7 @@ def draw_arrow(pair, alpha=alpha, ec=ec, labelcolor=labelcolor):
         elif where == 'center':
             orig_position = array([[length/2.0, 3*max_arrow_width]])
         else:
-            raise ValueError, "Got unknown position parameter %s" % where
+            raise ValueError("Got unknown position parameter %s" % where)
 
 
 

examples/pylab_examples/dashpointlabel.py

@@ -21,7 +21,7 @@
 
 (x,y) = zip(*DATA)
 ax.plot(x, y, marker='o')
-for i in xrange(len(DATA)):
+for i in range(len(DATA)):
     (x,y) = DATA[i]
     (dd, dl, r, dr, dp) = dash_style[i]
     #print 'dashlen call', dl

examples/pylab_examples/ellipse_demo.py

@@ -4,7 +4,7 @@
 NUM = 250
 
 ells = [Ellipse(xy=rand(2)*10, width=rand(), height=rand(), angle=rand()*360)
-        for i in xrange(NUM)]
+        for i in range(NUM)]
 
 fig = figure()
 ax = fig.add_subplot(111, aspect='equal')

examples/pylab_examples/image_demo3.py

@@ -2,7 +2,7 @@
 from pylab import *
 try:
     from PIL import Image
-except ImportError, exc:
+except ImportError:
     raise SystemExit("PIL must be installed to run this example")
 
 import matplotlib.cbook as cbook

examples/pylab_examples/integral_demo.py

@@ -17,7 +17,7 @@ def func(x):
 # make the shaded region
 ix = arange(a, b, 0.01)
 iy = func(ix)
-verts = [(a,0)] + zip(ix,iy) + [(b,0)]
+verts = [(a,0)] + list(zip(ix,iy)) + [(b,0)]
 poly = Polygon(verts, facecolor='0.8', edgecolor='k')
 ax.add_patch(poly)
 

examples/pylab_examples/line_collection2.py

@@ -21,7 +21,7 @@
 #          where onoffseq is an even length tuple of on and off ink in points.
 #          If linestyle is omitted, 'solid' is used
 # See matplotlib.collections.LineCollection for more information
-line_segments = LineCollection([zip(x,y) for y in ys], # Make a sequence of x,y pairs
+line_segments = LineCollection([list(zip(x,y)) for y in ys], # Make a sequence of x,y pairs
                                 linewidths    = (0.5,1,1.5,2),
                                 linestyles = 'solid')
 line_segments.set_array(x)