e227 e228

Signed-off-by: Thomas Hisch <t.hisch@gmail.com>

Author: twmr

examples/event_handling/data_browser.py

@@ -52,13 +52,13 @@ def update(self):
         ax2.cla()
         ax2.plot(X[dataind])
 
-        ax2.text(0.05, 0.9, 'mu=%1.3f\nsigma=%1.3f'%(xs[dataind], ys[dataind]),
+        ax2.text(0.05, 0.9, 'mu=%1.3f\nsigma=%1.3f' % (xs[dataind], ys[dataind]),
                  transform=ax2.transAxes, va='top')
         ax2.set_ylim(-0.5, 1.5)
         self.selected.set_visible(True)
         self.selected.set_data(xs[dataind], ys[dataind])
 
-        self.text.set_text('selected: %d'%dataind)
+        self.text.set_text('selected: %d' % dataind)
         fig.canvas.draw()
 
 

examples/event_handling/pick_event_demo2.py

@@ -27,7 +27,7 @@ def onpick(event):
     for subplotnum, dataind in enumerate(event.ind):
         ax = figi.add_subplot(N, 1, subplotnum+1)
         ax.plot(X[dataind])
-        ax.text(0.05, 0.9, 'mu=%1.3f\nsigma=%1.3f'%(xs[dataind], ys[dataind]),
+        ax.text(0.05, 0.9, 'mu=%1.3f\nsigma=%1.3f' % (xs[dataind], ys[dataind]),
                 transform=ax.transAxes, va='top')
         ax.set_ylim(-0.5, 1.5)
     figi.show()

examples/misc/image_thumbnail.py

@@ -11,11 +11,11 @@
 
 
 if len(sys.argv) != 2:
-    print('Usage: python %s IMAGEDIR'%__file__)
+    print('Usage: python %s IMAGEDIR' % __file__)
     raise SystemExit
 indir = sys.argv[1]
 if not os.path.isdir(indir):
-    print('Could not find input directory "%s"'%indir)
+    print('Could not find input directory "%s"' % indir)
     raise SystemExit
 
 outdir = 'thumbs'
@@ -26,4 +26,4 @@
     basedir, basename = os.path.split(fname)
     outfile = os.path.join(outdir, basename)
     fig = image.thumbnail(fname, outfile, scale=0.15)
-    print('saved thumbnail of %s to %s'%(fname, outfile))
+    print('saved thumbnail of %s to %s' % (fname, outfile))

examples/pylab_examples/anscombe.py

@@ -54,6 +54,6 @@ def fit(x):
 # verify the stats
 pairs = (x, y1), (x, y2), (x, y3), (x4, y4)
 for x, y in pairs:
-    print('mean=%1.2f, std=%1.2f, r=%1.2f'%(mean(y), std(y), corrcoef(x, y)[0][1]))
+    print('mean=%1.2f, std=%1.2f, r=%1.2f' % (mean(y), std(y), corrcoef(x, y)[0][1]))
 
 show()

examples/pylab_examples/cursor_demo.py

@@ -31,7 +31,7 @@ def mouse_move(self, event):
         self.lx.set_ydata(y)
         self.ly.set_xdata(x)
 
-        self.txt.set_text('x=%1.2f, y=%1.2f'%(x, y))
+        self.txt.set_text('x=%1.2f, y=%1.2f' % (x, y))
         draw()
 
 
@@ -63,8 +63,8 @@ def mouse_move(self, event):
         self.lx.set_ydata(y)
         self.ly.set_xdata(x)
 
-        self.txt.set_text('x=%1.2f, y=%1.2f'%(x, y))
-        print('x=%1.2f, y=%1.2f'%(x, y))
+        self.txt.set_text('x=%1.2f, y=%1.2f' % (x, y))
+        print('x=%1.2f, y=%1.2f' % (x, y))
         draw()
 
 t = arange(0.0, 1.0, 0.01)

examples/pylab_examples/data_helper.py

@@ -40,7 +40,7 @@ class C: pass
     def get_ticker(ticker):
         vals = []
 
-        datafile = cbook.get_sample_data('%s.csv'%ticker, asfileobj=False)
+        datafile = cbook.get_sample_data('%s.csv' % ticker, asfileobj=False)
 
         lines = open(datafile).readlines()
         for line in lines[1:]:

examples/pylab_examples/date_demo1.py

@@ -44,7 +44,7 @@
 
 
 # format the coords message box
-def price(x): return '$%1.2f'%x
+def price(x): return '$%1.2f' % x
 ax.fmt_xdata = DateFormatter('%Y-%m-%d')
 ax.fmt_ydata = price
 ax.grid(True)

examples/pylab_examples/finance_work2.py

@@ -119,7 +119,7 @@ def moving_average_convergence(x, nslow=26, nfast=12):
 ax1.set_ylim(0, 100)
 ax1.set_yticks([30, 70])
 ax1.text(0.025, 0.95, 'RSI (14)', va='top', transform=ax1.transAxes, fontsize=textsize)
-ax1.set_title('%s daily'%ticker)
+ax1.set_title('%s daily' % ticker)
 
 # plot the price and volume data
 dx = r.adj_close - r.close
@@ -171,7 +171,7 @@ def moving_average_convergence(x, nslow=26, nfast=12):
 ax3.fill_between(r.date, macd-ema9, 0, alpha=0.5, facecolor=fillcolor, edgecolor=fillcolor)
 
 
-ax3.text(0.025, 0.95, 'MACD (%d, %d, %d)'%(nfast, nslow, nema), va='top',
+ax3.text(0.025, 0.95, 'MACD (%d, %d, %d)' % (nfast, nslow, nema), va='top',
          transform=ax3.transAxes, fontsize=textsize)
 
 #ax3.set_yticks([])

examples/pylab_examples/image_slices_viewer.py

@@ -26,7 +26,7 @@ def onscroll(self, event):
 
     def update(self):
         self.im.set_data(self.X[:, :, self.ind])
-        ax.set_ylabel('slice %s'%self.ind)
+        ax.set_ylabel('slice %s' % self.ind)
         self.im.axes.figure.canvas.draw()
 
 

examples/pylab_examples/manual_axis.py

@@ -23,7 +23,7 @@ def make_xaxis(ax, yloc, offset=0.05, **props):
     tickline.set_clip_on(False)
     axline.set_clip_on(False)
     for loc in locs:
-        ax.text(loc, yloc-offset, '%1.1f'%loc,
+        ax.text(loc, yloc-offset, '%1.1f' % loc,
                 horizontalalignment='center',
                 verticalalignment='top')
 
@@ -39,7 +39,7 @@ def make_yaxis(ax, xloc=0, offset=0.05, **props):
     axline.set_clip_on(False)
 
     for loc in locs:
-        ax.text(xloc-offset, loc, '%1.1f'%loc,
+        ax.text(xloc-offset, loc, '%1.1f' % loc,
                 verticalalignment='center',
                 horizontalalignment='right')
 

examples/pylab_examples/movie_demo.py

@@ -13,7 +13,7 @@
 for i in range(50):  # 50 frames
     plt.cla()
     plt.imshow(np.random.rand(5, 5), interpolation='nearest')
-    fname = '_tmp%03d.png'%i
+    fname = '_tmp%03d.png' % i
     print('Saving frame', fname)
     plt.savefig(fname)
     files.append(fname)

examples/pylab_examples/step_demo.py

@@ -14,7 +14,7 @@
 y -= 0.5
 step(x, y, where='post', label='post')
 
-y = ma.masked_where((y0 > -0.15)&(y0 < 0.15), y - 0.5)
+y = ma.masked_where((y0 > -0.15) & (y0 < 0.15), y - 0.5)
 step(x, y, label='masked (pre)')
 
 legend()

examples/tests/backend_driver.py

@@ -330,7 +330,7 @@ def report_missing(dir, flist):
     missing = list(pyfiles-flist-exclude)
     missing.sort()
     if missing:
-        print('%s files not tested: %s'%(dir, ', '.join(missing)))
+        print('%s files not tested: %s' % (dir, ', '.join(missing)))
 
 
 def report_all_missing(directories):
@@ -386,7 +386,7 @@ def drive(backend, directories, python=['python'], switches=[]):
         fpath, fname = os.path.split(fullpath)
 
         if fname in exclude:
-            print('\tSkipping %s, known to fail on backend: %s'%backend)
+            print('\tSkipping %s, known to fail on backend: %s' % backend)
             continue
 
         basename, ext = os.path.splitext(fname)
@@ -492,7 +492,7 @@ def parse_options():
         for d in localdirs:
             if d.lower() not in all_backends_set:
                 continue
-            print('removing %s'%d)
+            print('removing %s' % d)
             for fname in glob.glob(os.path.join(d, '*')):
                 os.remove(fname)
             os.rmdir(d)

examples/units/basic_units.py

@@ -201,7 +201,7 @@ def __init__(self, name, fullname=None):
         self.conversions = dict()
 
     def __repr__(self):
-        return 'BasicUnit(%s)'%self.name
+        return 'BasicUnit(%s)' % self.name
 
     def __str__(self):
         return self.fullname

examples/user_interfaces/embedding_in_gtk2.py

@@ -43,7 +43,7 @@
 
 
 def on_key_event(event):
-    print('you pressed %s'%event.key)
+    print('you pressed %s' % event.key)
     key_press_handler(event, canvas, toolbar)
 
 canvas.mpl_connect('key_press_event', on_key_event)

examples/user_interfaces/embedding_in_tk.py

@@ -40,7 +40,7 @@
 
 
 def on_key_event(event):
-    print('you pressed %s'%event.key)
+    print('you pressed %s' % event.key)
     key_press_handler(event, canvas, toolbar)
 
 canvas.mpl_connect('key_press_event', on_key_event)

examples/user_interfaces/embedding_in_wx3.py

@@ -56,7 +56,7 @@ def __init__(self, parent):
         # Now put all into a sizer
         sizer = wx.BoxSizer(wx.VERTICAL)
         # This way of adding to sizer allows resizing
-        sizer.Add(self.canvas, 1, wx.LEFT|wx.TOP|wx.GROW)
+        sizer.Add(self.canvas, 1, wx.LEFT | wx.TOP | wx.GROW)
         # Best to allow the toolbar to resize!
         sizer.Add(self.toolbar, 0, wx.GROW)
         self.SetSizer(sizer)

examples/user_interfaces/fourier_demo_wx.py

@@ -90,7 +90,7 @@ def sliderTextHandler(self, evt):
         self.param.set(value)
 
     def setKnob(self, value):
-        self.sliderText.SetValue('%g'%value)
+        self.sliderText.SetValue('%g' % value)
         self.slider.SetValue(value*1000)
 
 

examples/user_interfaces/gtk_spreadsheet.py

@@ -74,7 +74,7 @@ def plot_row(self, treeview, path, view_column):
 
     def add_columns(self):
         for i in range(self.numCols):
-            column = gtk.TreeViewColumn('%d'%i, gtk.CellRendererText(), text=i)
+            column = gtk.TreeViewColumn('%d' % i, gtk.CellRendererText(), text=i)
             self.treeview.append_column(column)
 
     def create_model(self):

examples/user_interfaces/mpl_with_glade.py

@@ -62,7 +62,7 @@ def __init__(self):
             gtk.gdk.KEY_PRESS_MASK |
             gtk.gdk.KEY_RELEASE_MASK
             )
-        self.canvas.set_flags(gtk.HAS_FOCUS|gtk.CAN_FOCUS)
+        self.canvas.set_flags(gtk.HAS_FOCUS | gtk.CAN_FOCUS)
         self.canvas.grab_focus()
 
         def keypress(widget, event):

examples/user_interfaces/pylab_with_gtk.py

@@ -51,7 +51,7 @@ def update(event):
     if event.xdata is None:
         label.set_markup('Drag mouse over axes for position')
     else:
-        label.set_markup('<span color="#ef0000">x,y=(%f, %f)</span>'%(event.xdata, event.ydata))
+        label.set_markup('<span color="#ef0000">x,y=(%f, %f)</span>' % (event.xdata, event.ydata))
 
 plt.connect('motion_notify_event', update)
 

examples/user_interfaces/rec_edit_gtk_custom.py

@@ -30,7 +30,7 @@
 
 
 def mycallback(liststore, rownum, colname, oldval, newval):
-    print('verify: old=%s, new=%s, rec=%s'%(oldval, newval, liststore.r[rownum][colname]))
+    print('verify: old=%s, new=%s, rec=%s' % (oldval, newval, liststore.r[rownum][colname]))
 
 liststore.callbacks.connect('cell_changed', mycallback)
 

examples/user_interfaces/svg_histogram.py

@@ -62,18 +62,18 @@
 
 hist_patches = {}
 for ic, c in enumerate(containers):
-    hist_patches['hist_%d'%ic] = []
+    hist_patches['hist_%d' % ic] = []
     for il, element in enumerate(c):
-        element.set_gid('hist_%d_patch_%d'%(ic, il))
-        hist_patches['hist_%d'%ic].append('hist_%d_patch_%d'%(ic, il))    
+        element.set_gid('hist_%d_patch_%d' % (ic, il))
+        hist_patches['hist_%d' %ic].append('hist_%d_patch_%d' % (ic, il))
 
 # Set ids for the legend patches    
 for i, t in enumerate(leg.get_patches()):
-    t.set_gid('leg_patch_%d'%i)
+    t.set_gid('leg_patch_%d' % i)
 
 # Set ids for the text patches
 for i, t in enumerate(leg.get_texts()):
-    t.set_gid('leg_text_%d'%i)
+    t.set_gid('leg_text_%d' % i)
 
 # Save SVG in a fake file object.
 f = StringIO()
@@ -87,13 +87,13 @@
 
 # Add attributes to the patch objects.    
 for i, t in enumerate(leg.get_patches()):
-    el = xmlid['leg_patch_%d'%i]
+    el = xmlid['leg_patch_%d' % i]
     el.set('cursor', 'pointer')
     el.set('onclick', "toggle_hist(this)")
 
 # Add attributes to the text objects.    
 for i, t in enumerate(leg.get_texts()):
-    el = xmlid['leg_text_%d'%i]
+    el = xmlid['leg_text_%d' % i]
     el.set('cursor', 'pointer')
     el.set('onclick', "toggle_hist(this)")
 
@@ -142,7 +142,7 @@
     }
 ]]>
 </script>
-"""%json.dumps(hist_patches)
+""" % json.dumps(hist_patches)
 
 # Add a transition effect
 css = tree.getchildren()[0][0]

examples/user_interfaces/svg_tooltip.py

@@ -59,11 +59,11 @@
 
 # Set id for the patches    
 for i, t in enumerate(ax.patches):
-    t.set_gid('patch_%d'%i)
+    t.set_gid('patch_%d' % i)
 
 # Set id for the annotations
 for i, t in enumerate(ax.texts):
-    t.set_gid('tooltip_%d'%i)
+    t.set_gid('tooltip_%d' % i)
 
 
 # Save the figure in a fake file object
@@ -82,12 +82,12 @@
 
 # Hide the tooltips
 for i, t in enumerate(ax.texts):
-    el = xmlid['tooltip_%d'%i]
+    el = xmlid['tooltip_%d' % i]
     el.set('visibility', 'hidden')
 
 # Assign onmouseover and onmouseout callbacks to patches.        
 for i, t in enumerate(ax.patches):
-    el = xmlid['patch_%d'%i]
+    el = xmlid['patch_%d' % i]
     el.set('onmouseover', "ShowTooltip(this)")
     el.set('onmouseout', "HideTooltip(this)")