Skip to content

Commit 99c4b6f

Browse files
tacaswelltacaswell
committed
Merge pull request #3771 from thisch/pep8fix_e225_e227_e228
PEP8 : [examples] fix pep8 error classes e225, e227 and e228
2 parents a9767f7 + 588b582 commit 99c4b6f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+174
-174
lines changed

‎examples/event_handling/data_browser.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def __init__(self):
1919
def onpress(self, event):
2020
if self.lastind is None: return
2121
if event.key not in ('n', 'p'): return
22-
if event.key=='n': inc = 1
22+
if event.key == 'n': inc = 1
2323
else: inc = -1
2424

2525
self.lastind += inc
@@ -28,7 +28,7 @@ def onpress(self, event):
2828

2929
def onpick(self, event):
3030

31-
if event.artist!=line: return True
31+
if event.artist != line: return True
3232

3333
N = len(event.ind)
3434
if not N: return True
@@ -52,13 +52,13 @@ def update(self):
5252
ax2.cla()
5353
ax2.plot(X[dataind])
5454

55-
ax2.text(0.05, 0.9, 'mu=%1.3f\nsigma=%1.3f'%(xs[dataind], ys[dataind]),
55+
ax2.text(0.05, 0.9, 'mu=%1.3f\nsigma=%1.3f' % (xs[dataind], ys[dataind]),
5656
transform=ax2.transAxes, va='top')
5757
ax2.set_ylim(-0.5, 1.5)
5858
self.selected.set_visible(True)
5959
self.selected.set_data(xs[dataind], ys[dataind])
6060

61-
self.text.set_text('selected: %d'%dataind)
61+
self.text.set_text('selected: %d' % dataind)
6262
fig.canvas.draw()
6363

6464

‎examples/event_handling/idle_and_timeout.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919

2020

2121
def on_idle(event):
22-
on_idle.count +=1
22+
on_idle.count += 1
2323
print('idle', on_idle.count)
2424
line1.set_ydata(np.sin(2*np.pi*t*(N-on_idle.count)/float(N)))
2525
event.canvas.draw()
2626
# test boolean return removal
27-
if on_idle.count==N:
27+
if on_idle.count == N:
2828
return False
2929
return True
3030
on_idle.cid = None

‎examples/event_handling/keypress_demo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
def press(event):
1313
print('press', event.key)
1414
sys.stdout.flush()
15-
if event.key=='x':
15+
if event.key == 'x':
1616
visible = xl.get_visible()
1717
xl.set_visible(not visible)
1818
fig.canvas.draw()

‎examples/event_handling/looking_glass.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def __init__(self):
2121
self.pressevent = None
2222

2323
def onpress(self, event):
24-
if event.inaxes!=ax:
24+
if event.inaxes != ax:
2525
return
2626

2727
if not circ.contains(event)[0]:
@@ -34,7 +34,7 @@ def onrelease(self, event):
3434
self.x0, self.y0 = circ.center
3535

3636
def onmove(self, event):
37-
if self.pressevent is None or event.inaxes!=self.pressevent.inaxes:
37+
if self.pressevent is None or event.inaxes != self.pressevent.inaxes:
3838
return
3939

4040
dx = event.xdata - self.pressevent.xdata

‎examples/event_handling/path_editor.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ def get_ind_under_point(self, event):
8383
d = np.sqrt((xt-event.x)**2 + (yt-event.y)**2)
8484
ind = d.argmin()
8585

86-
if d[ind]>=self.epsilon:
86+
if d[ind] >= self.epsilon:
8787
ind = None
8888

8989
return ind
9090

9191
def button_press_callback(self, event):
9292
'whenever a mouse button is pressed'
9393
if not self.showverts: return
94-
if event.inaxes==None: return
94+
if event.inaxes == None: return
9595
if event.button != 1: return
9696
self._ind = self.get_ind_under_point(event)
9797

@@ -104,7 +104,7 @@ def button_release_callback(self, event):
104104
def key_press_callback(self, event):
105105
'whenever a key is pressed'
106106
if not event.inaxes: return
107-
if event.key=='t':
107+
if event.key == 't':
108108
self.showverts = not self.showverts
109109
self.line.set_visible(self.showverts)
110110
if not self.showverts: self._ind = None

‎examples/event_handling/pick_event_demo2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
def onpick(event):
2020

21-
if event.artist!=line: return True
21+
if event.artist != line: return True
2222

2323
N = len(event.ind)
2424
if not N: return True
@@ -27,7 +27,7 @@ def onpick(event):
2727
for subplotnum, dataind in enumerate(event.ind):
2828
ax = figi.add_subplot(N, 1, subplotnum+1)
2929
ax.plot(X[dataind])
30-
ax.text(0.05, 0.9, 'mu=%1.3f\nsigma=%1.3f'%(xs[dataind], ys[dataind]),
30+
ax.text(0.05, 0.9, 'mu=%1.3f\nsigma=%1.3f' % (xs[dataind], ys[dataind]),
3131
transform=ax.transAxes, va='top')
3232
ax.set_ylim(-0.5, 1.5)
3333
figi.show()

‎examples/event_handling/pipong.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ def __init__(self, disp, x, y, type='l'):
3838
self.score = 0
3939
self.xoffset = 0.3
4040
self.yoffset = 0.1
41-
if type=='r':
41+
if type == 'r':
4242
self.xoffset *= -1.0
4343

44-
if type=='l' or type=='r':
44+
if type == 'l' or type == 'r':
4545
self.signx = -1.0
4646
self.signy = 1.0
4747
else:
@@ -54,7 +54,7 @@ def contains(self, loc):
5454

5555
class Puck(object):
5656
def __init__(self, disp, pad, field):
57-
self.vmax= .2
57+
self.vmax = .2
5858
self.disp = disp
5959
self.field = field
6060
self._reset(pad)
@@ -76,8 +76,8 @@ def update(self, pads):
7676
self.y += self.vy
7777
for pad in pads:
7878
if pad.contains(self):
79-
self.vx *= 1.2 *pad.signx
80-
self.vy *= 1.2 *pad.signy
79+
self.vx *= 1.2 * pad.signx
80+
self.vy *= 1.2 * pad.signy
8181
fudge = .001
8282
# probably cleaner with something like...if not self.field.contains(self.x, self.y):
8383
if self.x < 0+fudge:
@@ -121,9 +121,9 @@ class Game(object):
121121
def __init__(self, ax):
122122
# create the initial line
123123
self.ax = ax
124-
padAx = padBx= .50
125-
padAy = padBy= .30
126-
padBx+=6.3
124+
padAx = padBx = .50
125+
padAy = padBy = .30
126+
padBx += 6.3
127127
pA, = self.ax.barh(padAy, .2, height=.3, color='k', alpha=.5, edgecolor='b', lw=2, label="Player B", animated=True)
128128
pB, = self.ax.barh(padBy, .2, height=.3, left=padBx, color='k', alpha=.5, edgecolor='r', lw=2, label="Player A", animated=True)
129129

@@ -147,7 +147,7 @@ def __init__(self, ax):
147147
self.pads = []
148148
self.pads.append(Pad(pA, 0, padAy))
149149
self.pads.append(Pad(pB, padBx, padBy, 'r'))
150-
self.pucks =[]
150+
self.pucks = []
151151
self.i = self.ax.annotate(instructions, (.5, 0.5),
152152
name='monospace',
153153
verticalalignment='center',
@@ -190,8 +190,8 @@ def draw(self, evt):
190190
for puck in self.pucks:
191191
if puck.update(self.pads):
192192
# we only get here if someone scored
193-
self.pads[0].disp.set_label(" "+ str(self.pads[0].score))
194-
self.pads[1].disp.set_label(" "+ str(self.pads[1].score))
193+
self.pads[0].disp.set_label(" " + str(self.pads[0].score))
194+
self.pads[1].disp.set_label(" " + str(self.pads[1].score))
195195
self.ax.legend(loc='center')
196196
self.leg = self.ax.get_legend()
197197
#self.leg.draw_frame(False) #don't draw the legend border
@@ -207,7 +207,7 @@ def draw(self, evt):
207207
# just redraw the axes rectangle
208208
self.canvas.blit(self.ax.bbox)
209209

210-
if self.cnt==50000:
210+
if self.cnt == 50000:
211211
# just so we don't get carried away
212212
print("...and you've been playing for too long!!!")
213213
plt.close()

‎examples/event_handling/poly_editor.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ def get_ind_under_point(self, event):
7474
indseq = np.nonzero(np.equal(d, np.amin(d)))[0]
7575
ind = indseq[0]
7676

77-
if d[ind]>=self.epsilon:
77+
if d[ind] >= self.epsilon:
7878
ind = None
7979

8080
return ind
8181

8282
def button_press_callback(self, event):
8383
'whenever a mouse button is pressed'
8484
if not self.showverts: return
85-
if event.inaxes==None: return
85+
if event.inaxes == None: return
8686
if event.button != 1: return
8787
self._ind = self.get_ind_under_point(event)
8888

@@ -95,23 +95,23 @@ def button_release_callback(self, event):
9595
def key_press_callback(self, event):
9696
'whenever a key is pressed'
9797
if not event.inaxes: return
98-
if event.key=='t':
98+
if event.key == 't':
9999
self.showverts = not self.showverts
100100
self.line.set_visible(self.showverts)
101101
if not self.showverts: self._ind = None
102-
elif event.key=='d':
102+
elif event.key == 'd':
103103
ind = self.get_ind_under_point(event)
104104
if ind is not None:
105-
self.poly.xy = [tup for i, tup in enumerate(self.poly.xy) if i!=ind]
105+
self.poly.xy = [tup for i, tup in enumerate(self.poly.xy) if i != ind]
106106
self.line.set_data(zip(*self.poly.xy))
107-
elif event.key=='i':
107+
elif event.key == 'i':
108108
xys = self.poly.get_transform().transform(self.poly.xy)
109109
p = event.x, event.y # display coords
110110
for i in range(len(xys)-1):
111111
s0 = xys[i]
112112
s1 = xys[i+1]
113113
d = dist_point_to_segment(p, s0, s1)
114-
if d<=self.epsilon:
114+
if d <= self.epsilon:
115115
self.poly.xy = np.array(
116116
list(self.poly.xy[:i]) +
117117
[(event.xdata, event.ydata)] +

‎examples/event_handling/zoom_window.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929

3030
def onpress(event):
31-
if event.button!=1: return
31+
if event.button != 1: return
3232
x, y = event.xdata, event.ydata
3333
axzoom.set_xlim(x-0.1, x+0.1)
3434
axzoom.set_ylim(y-0.1, y+0.1)

‎examples/misc/image_thumbnail.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import matplotlib.image as image
1111

1212

13-
if len(sys.argv)!=2:
14-
print('Usage: python %s IMAGEDIR'%__file__)
13+
if len(sys.argv) != 2:
14+
print('Usage: python %s IMAGEDIR' % __file__)
1515
raise SystemExit
1616
indir = sys.argv[1]
1717
if not os.path.isdir(indir):
18-
print('Could not find input directory "%s"'%indir)
18+
print('Could not find input directory "%s"' % indir)
1919
raise SystemExit
2020

2121
outdir = 'thumbs'
@@ -26,4 +26,4 @@
2626
basedir, basename = os.path.split(fname)
2727
outfile = os.path.join(outdir, basename)
2828
fig = image.thumbnail(fname, outfile, scale=0.15)
29-
print('saved thumbnail of %s to %s'%(fname, outfile))
29+
print('saved thumbnail of %s to %s' % (fname, outfile))

‎examples/misc/rc_traits.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ def __init__(self, r=0., g=0., b=0., a=1.):
5252
self.a = a
5353

5454
def __repr__(self):
55-
return 'r,g,b,a = (%1.2f, %1.2f, %1.2f, %1.2f)'%\
55+
return 'r,g,b,a = (%1.2f, %1.2f, %1.2f, %1.2f)' %\
5656
(self.r, self.g, self.b, self.a)
5757

5858

5959
def tuple_to_rgba(ob, name, val):
6060
tup = [float(x) for x in val]
61-
if len(tup)==3:
61+
if len(tup) == 3:
6262
r, g, b = tup
6363
return RGBA(r, g, b)
64-
elif len(tup)==4:
64+
elif len(tup) == 4:
6565
r, g, b, a = tup
6666
return RGBA(r, g, b, a)
6767
else:

‎examples/misc/svg_filter_pie.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
labels = 'Frogs', 'Hogs', 'Dogs', 'Logs'
2121
fracs = [15, 30, 45, 10]
2222

23-
explode=(0, 0.05, 0, 0)
23+
explode = (0, 0.05, 0, 0)
2424

2525
# We want to draw the shadow for each pie but we will not use "shadow"
2626
# option as it does'n save the references to the shadow patches.

‎examples/pylab_examples/animation_demo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
z = x * y[:, np.newaxis]
1515

1616
for i in xrange(5):
17-
if i==0:
17+
if i == 0:
1818
p = plt.imshow(z)
1919
fig = plt.gcf()
2020
plt.clim() # clamp the color limits

‎examples/pylab_examples/anscombe.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ def fit(x):
5454
# verify the stats
5555
pairs = (x, y1), (x, y2), (x, y3), (x4, y4)
5656
for x, y in pairs:
57-
print('mean=%1.2f, std=%1.2f, r=%1.2f'%(mean(y), std(y), corrcoef(x, y)[0][1]))
57+
print('mean=%1.2f, std=%1.2f, r=%1.2f' % (mean(y), std(y), corrcoef(x, y)[0][1]))
5858

5959
show()

‎examples/pylab_examples/arrow_demo.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"""
1212
from pylab import *
1313

14-
rates_to_bases={'r1': 'AT', 'r2': 'TA', 'r3': 'GA', 'r4': 'AG', 'r5': 'CA', 'r6': 'AC', \
14+
rates_to_bases = {'r1': 'AT', 'r2': 'TA', 'r3': 'GA', 'r4': 'AG', 'r5': 'CA', 'r6': 'AC', \
1515
'r7': 'GT', 'r8': 'TG', 'r9': 'CT', 'r10': 'TC', 'r11': 'GC', 'r12': 'CG'}
1616
numbered_bases_to_rates = dict([(v, k) for k, v in rates_to_bases.items()])
1717
lettered_bases_to_rates = dict([(v, 'r'+v) for k, v in rates_to_bases.items()])
@@ -53,7 +53,7 @@ def make_arrow_plot(data, size=4, display='length', shape='right', \
5353
max_text_size = size*12
5454
min_text_size = size
5555
label_text_size = size*2.5
56-
text_params={'ha': 'center', 'va': 'center', 'family': 'sans-serif',\
56+
text_params = {'ha': 'center', 'va': 'center', 'family': 'sans-serif',\
5757
'fontweight': 'bold'}
5858
r2 = sqrt(2)
5959

@@ -117,7 +117,7 @@ def do_fontsize(k):
117117
max_arrow_width = max_arrow_width
118118
max_head_width = 2.5*max_arrow_width
119119
max_head_length = 2*max_arrow_width
120-
arrow_params={'length_includes_head': True, 'shape': shape, \
120+
arrow_params = {'length_includes_head': True, 'shape': shape, \
121121
'head_starts_at_zero': head_starts_at_zero}
122122
ax = gca()
123123
sf = 0.6 # max arrow size represents this in data coords
@@ -154,15 +154,15 @@ def do_fontsize(k):
154154
def draw_arrow(pair, alpha=alpha, ec=ec, labelcolor=labelcolor):
155155
# set the length of the arrow
156156
if display == 'length':
157-
length = max_head_length+(max_arrow_length-max_head_length)*\
157+
length = max_head_length+(max_arrow_length-max_head_length) *\
158158
data[pair]/sf
159159
else:
160160
length = max_arrow_length
161161
# set the transparency of the arrow
162162
if display == 'alph':
163163
alpha = min(data[pair]/sf, alpha)
164164
else:
165-
alpha=alpha
165+
alpha = alpha
166166
# set the width of the arrow
167167
if display == 'width':
168168
scale = data[pair]/sf
@@ -295,7 +295,7 @@ def draw_arrow(pair, alpha=alpha, ec=ec, labelcolor=labelcolor):
295295
scaled = True
296296
if d is None:
297297
d = all_on_max
298-
scaled=False
298+
scaled = False
299299
if len(argv) > 2:
300300
display = argv[2]
301301
else:

‎examples/pylab_examples/axes_zoom_effect.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ def zoom_effect01(ax1, ax2, xmin, xmax, **kwargs):
4949
mybbox1 = TransformedBbox(bbox, trans1)
5050
mybbox2 = TransformedBbox(bbox, trans2)
5151

52-
prop_patches=kwargs.copy()
53-
prop_patches["ec"]="none"
54-
prop_patches["alpha"]=0.2
52+
prop_patches = kwargs.copy()
53+
prop_patches["ec"] = "none"
54+
prop_patches["alpha"] = 0.2
5555

5656
c1, c2, bbox_patch1, bbox_patch2, p = \
5757
connect_bbox(mybbox1, mybbox2,
@@ -82,9 +82,9 @@ def zoom_effect02(ax1, ax2, **kwargs):
8282
mybbox1 = ax1.bbox
8383
mybbox2 = TransformedBbox(ax1.viewLim, trans)
8484

85-
prop_patches=kwargs.copy()
86-
prop_patches["ec"]="none"
87-
prop_patches["alpha"]=0.2
85+
prop_patches = kwargs.copy()
86+
prop_patches["ec"] = "none"
87+
prop_patches["alpha"] = 0.2
8888

8989
c1, c2, bbox_patch1, bbox_patch2, p = \
9090
connect_bbox(mybbox1, mybbox2,

0 commit comments

Comments
 (0)