Merge pull request matplotlib#7547 from anntzer/additional-cleanups

Additional cleanups

Author: QuLogic

boilerplate.py

@@ -317,7 +317,7 @@ def format_value(value):
             # A gensym-like facility in case some function takes an
             # argument named washold, ax, or ret
             washold, ret, ax = 'washold', 'ret', 'ax'
-            bad = set(args) | set((varargs, varkw))
+            bad = set(args) | {varargs, varkw}
             while washold in bad or ret in bad or ax in bad:
                 washold = 'washold' + str(random.randrange(10 ** 12))
                 ret = 'ret' + str(random.randrange(10 ** 12))

doc/sphinxext/gen_gallery.py

@@ -76,12 +76,10 @@ def gen_gallery(app, doctree):
     # images we want to skip for the gallery because they are an unusual
     # size that doesn't layout well in a table, or because they may be
     # redundant with other images or uninteresting
-    skips = set([
-        'mathtext_examples',
-        'matshow_02',
-        'matshow_03',
-        'matplotlib_icon',
-        ])
+    skips = {'mathtext_examples',
+             'matshow_02',
+             'matshow_03',
+             'matplotlib_icon'}
 
     thumbnails = {}
     rows = []

doc/utils/pylab_names.py

@@ -46,16 +46,13 @@
 
     print()
     funcs, docs = zip(*modd[mod])
-    maxfunc = max([len(f) for f in funcs])
-    maxdoc = max(40, max([len(d) for d in docs]) )
-    border = ' '.join(['='*maxfunc, '='*maxdoc])
+    maxfunc = max(len(f) for f in funcs)
+    maxdoc = max(40, max(len(d) for d in docs))
+    border = '=' * maxfunc + ' ' + '=' * maxdoc
     print(border)
-    print(' '.join(['symbol'.ljust(maxfunc), 'description'.ljust(maxdoc)]))
+    print('{:<{}} {:<{}}'.format('symbol', maxfunc, 'description', maxdoc))
     print(border)
     for func, doc in modd[mod]:
-        row = ' '.join([func.ljust(maxfunc), doc.ljust(maxfunc)])
-        print(row)
-
+        print('{:<{}} {:<{}}'.format(func, maxfunc, doc, maxdoc))
     print(border)
     print()
-    #break

examples/api/collections_demo.py

@@ -89,9 +89,8 @@
 
 # 7-sided regular polygons
 
-col = collections.RegularPolyCollection(7,
-                                        sizes=np.fabs(xx) * 10.0, offsets=xyo,
-                                        transOffset=ax3.transData)
+col = collections.RegularPolyCollection(
+    7, sizes=np.abs(xx) * 10.0, offsets=xyo, transOffset=ax3.transData)
 trans = transforms.Affine2D().scale(fig.dpi / 72.0)
 col.set_transform(trans)  # the points to pixels transform
 ax3.add_collection(col, autolim=True)
@@ -109,7 +108,7 @@
 offs = (0.1, 0.0)
 
 yy = np.linspace(0, 2*np.pi, nverts)
-ym = np.amax(yy)
+ym = np.max(yy)
 xx = (0.2 + (ym - yy)/ym)**2 * np.cos(yy - 0.4)*0.5
 segs = []
 for i in range(ncurves):

examples/api/sankey_demo_old.py

@@ -37,11 +37,11 @@ def sankey(ax,
     import matplotlib.patches as mpatches
     from matplotlib.path import Path
 
-    outs = np.absolute(outputs)
+    outs = np.abs(outputs)
     outsigns = np.sign(outputs)
     outsigns[-1] = 0  # Last output
 
-    ins = np.absolute(inputs)
+    ins = np.abs(inputs)
     insigns = np.sign(inputs)
     insigns[0] = 0  # First input
 

examples/axes_grid1/scatter_hist.py

@@ -30,7 +30,7 @@
 
 # now determine nice limits by hand:
 binwidth = 0.25
-xymax = np.max([np.max(np.fabs(x)), np.max(np.fabs(y))])
+xymax = max(np.max(np.abs(x)), np.max(np.abs(y)))
 lim = (int(xymax/binwidth) + 1)*binwidth
 
 bins = np.arange(-lim, lim + binwidth, binwidth)

examples/axes_grid1/simple_axesgrid.py

@@ -2,8 +2,7 @@
 from mpl_toolkits.axes_grid1 import ImageGrid
 import numpy as np
 
-im = np.arange(100)
-im.shape = 10, 10
+im = np.arange(100).reshape((10, 10))
 
 fig = plt.figure(1, (4., 4.))
 grid = ImageGrid(fig, 111,  # similar to subplot(111)

examples/event_handling/poly_editor.py

@@ -70,8 +70,8 @@ def get_ind_under_point(self, event):
         xy = np.asarray(self.poly.xy)
         xyt = self.poly.get_transform().transform(xy)
         xt, yt = xyt[:, 0], xyt[:, 1]
-        d = np.sqrt((xt - event.x)**2 + (yt - event.y)**2)
-        indseq = np.nonzero(np.equal(d, np.amin(d)))[0]
+        d = np.hypot(xt - event.x, yt - event.y)
+        indseq, = np.nonzero(d == d.min())
         ind = indseq[0]
 
         if d[ind] >= self.epsilon:

examples/pylab_examples/agg_buffer.py

@@ -26,8 +26,7 @@
 l, b, w, h = agg.figure.bbox.bounds
 w, h = int(w), int(h)
 
-X = np.fromstring(s, np.uint8)
-X.shape = h, w, 3
+X = np.fromstring(s, np.uint8).reshape((h, w, 3))
 
 try:
     im = Image.fromstring("RGB", (w, h), s)

examples/pylab_examples/anscombe.py

@@ -22,7 +22,7 @@ def fit(x):
     return 3 + 0.5*x
 
 
-xfit = np.array([np.amin(x), np.amax(x)])
+xfit = np.array([np.min(x), np.max(x)])
 
 plt.subplot(221)
 plt.plot(x, y1, 'ks', xfit, fit(xfit), 'r-', lw=2)
@@ -43,8 +43,7 @@ def fit(x):
 plt.setp(plt.gca(), yticks=(4, 8, 12), xticks=(0, 10, 20))
 
 plt.subplot(224)
-
-xfit = np.array([np.amin(x4), np.amax(x4)])
+xfit = np.array([np.min(x4), np.max(x4)])
 plt.plot(x4, y4, 'ks', xfit, fit(xfit), 'r-', lw=2)
 plt.axis([2, 20, 2, 14])
 plt.setp(plt.gca(), yticklabels=[], yticks=(4, 8, 12), xticks=(0, 10, 20))