8000 pep8 fix E701 · matplotlib/matplotlib@b081c92 · GitHub
[go: up one dir, main page]
Skip to content

Commit b081c92

Browse files
twmrtwmr
committed
pep8 fix E701
1 parent b680680 commit b081c92

18 files changed

+114
-57
lines changed

‎examples/event_handling/data_browser.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,27 @@ def __init__(self):
1717
color='yellow', visible=False)
1818

1919
def onpress(self, event):
20-
if self.lastind is None: return
21-
if event.key not in ('n', 'p'): return
22-
if event.key == 'n': inc = 1
23-
else: inc = -1
20+
if self.lastind is None:
21+
return
22+
if event.key not in ('n', 'p'):
23+
return
24+
if event.key == 'n':
25+
inc = 1
26+
else:
27+
inc = -1
2428

2529
self.lastind += inc
2630
self.lastind = np.clip(self.lastind, 0, len(xs) - 1)
2731
self.update()
2832

2933
def onpick(self, event):
3034

31-
if event.artist != line: return True
35+
if event.artist != line:
36+
return True
3237

3338
N = len(event.ind)
34-
if not N: return True
39+
if not N:
40+
return True
3541

3642
# the click locations
3743
x = event.mouseevent.xdata
@@ -45,7 +51,8 @@ def onpick(self, event):
4551
self.update()
4652

4753
def update(self):
48-
if self.lastind is None: return
54+
if self.lastind is None:
55+
return
4956

5057
dataind = self.lastind
5158

‎examples/event_handling/lasso_demo.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ class Datum(object):
2323
def __init__(self, x, y, include=False):
2424
self.x = x
2525
self.y = y
26-
if include: self.color = self.colorin
27-
else: self.color = self.colorout
26+
if include:
27+
self.color = self.colorin
28+
else:
29+
self.color = self.colorout
2830

2931

3032
class LassoManager(object):
@@ -63,8 +65,10 @@ def callback(self, verts):
6365
del self.lasso
6466

6567
def onpress(self, event):
66-
if self.canvas.widgetlock.locked(): return
67-
if event.inaxes is None: return
68+
if self.canvas.widgetlock.locked():
69+
return
70+
if event.inaxes is None:
71+
return
6872
self.lasso = Lasso(event.inaxes, (event.xdata, event.ydata), self.callback)
6973
# acquire a lock on the widget drawing
7074
self.canvas.widgetlock(self.lasso)

‎examples/event_handling/path_editor.py

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,33 +90,44 @@ def get_ind_under_point(self, event):
9090

9191
def button_press_callback(self, event):
9292
'whenever a mouse button is pressed'
93-
if not self.showverts: return
94-
if event.inaxes == None: return
95-
if event.button != 1: return
93+
if not self.showverts:
94+
return
95+
if event.inaxes == None:
96+
return
97+
if event.button != 1:
98+
return
9699
self._ind = self.get_ind_under_point(event)
97100

98101
def button_release_callback(self, event):
99102
'whenever a mouse button is released'
100-
if not self.showverts: return
101-
if event.button != 1: return
103+
if not self.showverts:
104+
return
105+
if event.button != 1:
106+
return
102107
self._ind = None
103108

104109
def key_press_callback(self, event):
105110
'whenever a key is pressed'
106-
if not event.inaxes: return
111+
if not event.inaxes:
112+
return
107113
if event.key == 't':
108114
self.showverts = not self.showverts
109115
self.line.set_visible(self.showverts)
110-
if not self.showverts: self._ind = None
116+
if not self.showverts:
117+
self._ind = None
111118

112119
self.canvas.draw()
113120

114121
def motion_notify_callback(self, event):
115122
'on mouse movement'
116-
if not self.showverts: return
117-
if self._ind is None: return
118-
if event.inaxes is None: return
119-
if event.button != 1: return
123+
if not self.showverts:
124+
return
125+
if self._ind is None:
126+
return
127+
if event.inaxes is None:
128+
return
129+
if event.button != 1:
130+
return
120131
x, y = event.xdata, event.ydata
121132

122133
vertices = self.pathpatch.get_path().vertices

‎examples/event_handling/pick_event_demo.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ def line_picker(line, mouseevent):
116116
data coords and attach some extra attributes, pickx and picky
117117
which are the data points that were picked
118118
"""
119-
if mouseevent.xdata is None: return False, dict()
119+
if mouseevent.xdata is None:
120+
return False, dict()
120121
xdata = line.get_xdata()
121122
ydata = line.get_ydata()
122123
maxd = 0.05

‎examples/event_handling/pick_event_demo2.py

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

1919
def onpick(event):
2020

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

2324
N = len(event.ind)
24-
if not N: return True
25+
if not N:
26+
return True
2527

2628
figi = plt.figure()
2729
for subplotnum, dataind in enumerate(event.ind):

‎examples/event_handling/poly_editor.py

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,24 +81,31 @@ def get_ind_under_point(self, event):
8181

8282
def button_press_callback(self, event):
8383
'whenever a mouse button is pressed'
84-
if not self.showverts: return
85-
if event.inaxes == None: return
86-
if event.button != 1: return
84+
if not self.showverts:
85+
return
86+
if event.inaxes == None:
87+
return
88+
if event.button != 1:
89+
return
8790
self._ind = self.get_ind_under_point(event)
8891

8992
def button_release_callback(self, event):
9093
'whenever a mouse button is released'
91-
if not self.showverts: return
92-
if event.button != 1: return
94+
if not self.showverts:
95+
return
96+
if event.button != 1:
97+
return
9398
self._ind = None
9499

95100
def key_press_callback(self, event):
96101
'whenever a key is pressed'
97-
if not event.inaxes: return
102+
if not event.inaxes:
103+
return
98104
if event.key == 't':
99105
self.showverts = not self.showverts
100106
self.line.set_visible(self.showverts)
101-
if not self.showverts: self._ind = None
107+
if not self.showverts:
108+
self._ind = None
102109
elif event.key == 'd':
103110
ind = self.get_ind_under_point(event)
104111
if ind is not None:
@@ -123,10 +130,14 @@ def key_press_callback(self, event):
123130

124131
def motion_notify_callback(self, event):
125132
'on mouse movement'
126-
if not self.showverts: return
127-
if self._ind is None: return
128-
if event.inaxes is None: return
129-
if event.button != 1: return
133+
if not self.showverts:
134+
return
135+
if self._ind is None:
136+
return
137+
if event.inaxes is None:
138+
return
139+
if event.button != 1:
140+
return
130141
x, y = event.xdata, event.ydata
131142

132143
self.poly.xy[self._ind] = x, y

‎examples/event_handling/zoom_window.py

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

2929

3030
def onpress(event):
31-
if event.button != 1: return
31+
if event.button != 1:
32+
return
3233
x, y = event.xdata, event.ydata
3334
axzoom.set_xlim(x - 0.1, x + 0.1)
3435
axzoom.set_ylim(y - 0.1, y + 0.1)

‎examples/misc/rc_traits.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,14 @@ def __init__(self,
176176
):
177177
Artist.__init__(self)
178178

179-
if edgecolor is None: edgecolor = rc.patch.edgecolor
180-
if facecolor is None: facecolor = rc.patch.facecolor
181-
if linewidth is None: linewidth = rc.patch.linewidth
182-
if antialiased is None: antialiased = rc.patch.antialiased
179+
if edgecolor is None:
180+
edgecolor = rc.patch.edgecolor
181+
if facecolor is None:
182+
facecolor = rc.patch.facecolor
183+
if linewidth is None:
184+
linewidth = rc.patch.linewidth
185+
if antialiased is None:
186+
antialiased = rc.patch.antialiased
183187

184188
self.edgecolor = edgecolor
185189
self.facecolor = facecolor
@@ -196,8 +200,10 @@ def __init__(self,
196200
p.fill = 'f'
197201
print('p.facecolor', type(p.facecolor), p.facecolor)
198202
print('p.fill', type(p.fill), p.fill)
199-
if p.fill_: print('fill')
200-
else: print('no fill')
203+
if p.fill_:
204+
print('fill')
205+
else:
206+
print('no fill')
201207
if doprint:
202208
print()
203209
print('Patch')

‎examples/pylab_examples/cursor_demo.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ def __init__(self, ax):
2424
self.txt = ax.text(0.7, 0.9, '', transform=ax.transAxes)
2525

2626
def mouse_move(self, event):
27-
if not event.inaxes: return
27+
if not event.inaxes:
28+
return
2829

2930
x, y = event.xdata, event.ydata
3031
# update the line positions
@@ -52,7 +53,8 @@ def __init__(self, ax, x, y):
5253

5354
def mouse_move(self, event):
5455

55-
if not event.inaxes: return
56+
if not event.inaxes:
57+
return
5658

5759
x, y = event.xdata, event.ydata
5860

‎examples/pylab_examples/data_helper.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ def get_daily_data():
3636
as numeric arrays
3737
3838
"""
39-
class C: pass
39+
class C:
40+
pass
4041
def get_ticker(ticker):
4142
vals = []
4243

‎examples/pylab_examples/date_index_formatter.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ def __init__(self, dates, fmt='%Y-%m-%d'):
2828
def __call__(self, x, pos=0):
2929
'Return the label for time x at position pos'
3030
ind = int(round(x))
31-
if ind >= len(self.dates) or ind < 0: return ''
31+
if ind >= len(self.dates) or ind < 0:
32+
return ''
3233

3334
return self.dates[ind].strftime(self.fmt)
3435

‎examples/pylab_examples/ginput_manual_clabel.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ def tellme(s):
5454

5555
# Get rid of fill
5656
if not happy:
57-
for p in ph: p.remove()
57+
for p in ph:
58+
p.remove()
5859

5960
##################################################
6061
# Now contour according to distance from triangle
@@ -89,7 +90,8 @@ def f(x, y, pts):
8990
pts = np.asarray(plt.ginput(2, timeout=-1))
9091

9192
happy = len(pts) < 2
92-
if happy: break
93+
if happy:
94+
break
9395

9496
pts = np.sort(pts, axis=0)
9597
plt.axis(pts.T.ravel())

‎examples/pylab_examples/movie_demo.py

-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@
2323
#os.system("convert _tmp*.png animation.mng")
2424

2525
# cleanup
26-
for fname in files: os.remove(fname)
26+
for fname in files:
27+
os.remove(fname)

‎examples/pylab_examples/toggle_images.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333

3434
def toggle_images(event):
3535
'toggle the visible state of the two images'
36-
if event.key != 't': return
36+
if event.key != 't':
37+
return
3738
b1 = im1.get_visible()
3839
b2 = im2.get_visible()
3940
im1.set_visible(not b1)

‎examples/units/evans_test.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ def __init__(self, val, unit=1.0):
1616
self._val = val * unit
1717

1818
def value(self, unit):
19-
if unit is None: unit = self.unit
19+
if unit is None:
20+
unit = self.unit
2021
return self._val / unit
2122

2223

‎examples/user_interfaces/embedding_in_wx5.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,5 @@ def demo():
5050
frame.Show()
5151
app.MainLoop()
5252

53-
if __name__ == "__main__": demo()
53+
if __name__ == "__main__":
54+
demo()

‎examples/user_interfaces/interactive.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,8 @@ def pre_interact(self):
225225
else:
226226
print('*** Executing file <%s>:' % fname)
227227
for line in inFile:
228-
if line.lstrip().find('show()') == 0: continue
228+
if line.lstrip().find('show()') == 0:
229+
continue
229230
print('>>', line)
230231
push(line)
231232
inFile.close()

‎examples/widgets/check_buttons.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@
1818

1919

2020
def func(label):
21-
if label == '2 Hz': l0.set_visible(not l0.get_visible())
22-
elif label == '4 Hz': l1.set_visible(not l1.get_visible())
23-
elif label == '6 Hz': l2.set_visible(not l2.get_visible())
21+
if label == '2 Hz':
22+
l0.set_visible(not l0.get_visible())
23+
elif label == '4 Hz':
24+
l1.set_visible(not l1.get_visible())
25+
elif label == '6 Hz':
26+
l2.set_visible(not l2.get_visible())
2427
plt.draw()
2528
check.on_clicked(func)
2629

0 commit comments

Comments
 (0)
0