Skip to content

Commit d5fdebb

Browse files
committed
Remove most instances of pep8 E502 (redundant backslashes).
1 parent 3c1f423 commit d5fdebb

File tree

9 files changed

+38
-53
lines changed

9 files changed

+38
-53
lines changed

lib/matplotlib/tests/test_image.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,8 @@ def test_get_window_extent_for_AxisImage():
450450
# object at a given location and check that get_window_extent()
451451
# returns the correct bounding box values (in pixels).
452452

453-
im = np.array([[0.25, 0.75, 1.0, 0.75], [0.1, 0.65, 0.5, 0.4], \
454-
[0.6, 0.3, 0.0, 0.2], [0.7, 0.9, 0.4, 0.6]])
453+
im = np.array([[0.25, 0.75, 1.0, 0.75], [0.1, 0.65, 0.5, 0.4],
454+
[0.6, 0.3, 0.0, 0.2], [0.7, 0.9, 0.4, 0.6]])
455455
fig = plt.figure(figsize=(10, 10), dpi=100)
456456
ax = plt.subplot()
457457
ax.set_position([0, 0, 1, 1])

lib/mpl_toolkits/axes_grid1/mpl_axes.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ def __init__(self, axis, axisnum, spine):
8787

8888
def _get_major_ticks(self):
8989
tickline = "tick%dline" % self._axisnum
90-
return SimpleChainedObjects([getattr(tick, tickline) for tick \
91-
in self._axis.get_major_ticks()])
90+
return SimpleChainedObjects([getattr(tick, tickline)
91+
for tick in self._axis.get_major_ticks()])
9292

9393
def _get_major_ticklabels(self):
9494
label = "label%d" % self._axisnum
95-
return SimpleChainedObjects([getattr(tick, label) for tick \
96-
in self._axis.get_major_ticks()])
95+
return SimpleChainedObjects([getattr(tick, label)
96+
for tick in self._axis.get_major_ticks()])
9797

9898
def _get_label(self):
9999
return self._axis.label

lib/mpl_toolkits/axes_grid1/parasite_axes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ def _remove_method(h):
395395

396396
def get_tightbbox(self, renderer, call_axes_locator=True):
397397

398-
bbs = [ax.get_tightbbox(renderer, call_axes_locator) \
398+
bbs = [ax.get_tightbbox(renderer, call_axes_locator)
399399
for ax in self.parasites]
400400
get_tightbbox = self._get_base_axes_attr("get_tightbbox")
401401
bbs.append(get_tightbbox(self, renderer, call_axes_locator))

lib/mpl_toolkits/axisartist/angle_helper.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -282,15 +282,15 @@ def __call__(self, direction, factor, values):
282282
if number_fraction is None:
283283
return [self.fmt_d % (s*int(v),) for (s, v) in zip(ss, values)]
284284
else:
285-
return [self.fmt_ds % (s*int(v), f1) for (s, v, f1) in \
286-
zip(ss, values, frac_str)]
285+
return [self.fmt_ds % (s*int(v), f1)
286+
for (s, v, f1) in zip(ss, values, frac_str)]
287287
elif factor == 60:
288288
deg_part, min_part = divmod(values, 60)
289289
if number_fraction is None:
290-
return [self.fmt_d_m % (s1, d1, m1) \
290+
return [self.fmt_d_m % (s1, d1, m1)
291291
for s1, d1, m1 in zip(signs, deg_part, min_part)]
292292
else:
293-
return [self.fmt_d_ms % (s, d1, m1, f1) \
293+
return [self.fmt_d_ms % (s, d1, m1, f1)
294294
for s, d1, m1, f1 in zip(signs, deg_part, min_part, frac_str)]
295295

296296
elif factor == 3600:

lib/mpl_toolkits/axisartist/axislines.py

+7-15
Original file line numberDiff line numberDiff line change
@@ -233,21 +233,15 @@ class AxisArtistHelperRectlinear(object):
233233

234234
class Fixed(AxisArtistHelper.Fixed):
235235

236-
def __init__(self,
237-
axes, loc, nth_coord=None,
238-
):
236+
def __init__(self, axes, loc, nth_coord=None):
239237
"""
240238
nth_coord = along which coordinate value varies
241239
in 2d, nth_coord = 0 -> x axis, nth_coord = 1 -> y axis
242240
"""
243-
244-
super(AxisArtistHelperRectlinear.Fixed, self).__init__( \
245-
loc, nth_coord)
246-
241+
super(AxisArtistHelperRectlinear.Fixed, self).__init__(
242+
loc, nth_coord)
247243
self.axis = [axes.xaxis, axes.yaxis][self.nth_coord]
248244

249-
250-
251245
# TICK
252246

253247
def get_tick_iterators(self, axes):
@@ -293,14 +287,11 @@ def _f(locs, labels):
293287
class Floating(AxisArtistHelper.Floating):
294288
def __init__(self, axes, nth_coord,
295289
passingthrough_point, axis_direction="bottom"):
296-
297-
super(AxisArtistHelperRectlinear.Floating, self).__init__( \
290+
super(AxisArtistHelperRectlinear.Floating, self).__init__(
298291
nth_coord, passingthrough_point)
299292
self._axis_direction = axis_direction
300-
301293
self.axis = [axes.xaxis, axes.yaxis][self.nth_coord]
302294

303-
304295
def get_line(self, axes):
305296
_verts = np.array([[0., 0.],
306297
[1., 1.]])
@@ -498,13 +489,14 @@ def new_floating_axis(self, nth_coord, value,
498489
):
499490

500491
if axes is None:
501-
warnings.warn("'new_floating_axis' explicitly requires the axes keyword.")
492+
warnings.warn(
493+
"'new_floating_axis' explicitly requires the axes keyword.")
502494
axes = self.axes
503495

504496
passthrough_point = (value, value)
505497
transform = axes.transData
506498

507-
_helper = AxisArtistHelperRectlinear.Floating( \
499+
_helper = AxisArtistHelperRectlinear.Floating(
508500
axes, nth_coord, value, axis_direction)
509501

510502
axisline = AxisArtist(axes, _helper)

lib/mpl_toolkits/axisartist/grid_finder.py

+8-13
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ def _get_raw_grid_lines(self,
144144
lons_i = np.linspace(lon_min, lon_max, 100) # for interpolation
145145
lats_i = np.linspace(lat_min, lat_max, 100)
146146

147-
lon_lines = [self.transform_xy(np.zeros_like(lats_i)+lon, lats_i) \
147+
lon_lines = [self.transform_xy(np.zeros_like(lats_i) + lon, lats_i)
148148
for lon in lon_values]
149-
lat_lines = [self.transform_xy(lons_i, np.zeros_like(lons_i)+lat) \
149+
lat_lines = [self.transform_xy(lons_i, np.zeros_like(lons_i) + lat)
150150
for lat in lat_values]
151151

152152
return lon_lines, lat_lines
@@ -212,8 +212,6 @@ def update(self, **kw):
212212
raise ValueError("unknown update property '%s'" % k)
213213

214214

215-
216-
217215
class GridFinder(GridFinderBase):
218216

219217
def __init__(self,
@@ -231,7 +229,6 @@ def __init__(self,
231229
232230
locator1, locator2 : grid locator for 1st and 2nd axis.
233231
"""
234-
235232
if extreme_finder is None:
236233
extreme_finder = ExtremeFinderSimple(20, 20)
237234
if grid_locator1 is None:
@@ -242,14 +239,12 @@ def __init__(self,
242239
tick_formatter1 = FormatterPrettyPrint()
243240
if tick_formatter2 is None:
244241
tick_formatter2 = FormatterPrettyPrint()
245-
246-
super(GridFinder, self).__init__( \
247-
extreme_finder,
248-
grid_locator1,
249-
grid_locator2,
250-
tick_formatter1,
251-
tick_formatter2)
252-
242+
super(GridFinder, self).__init__(
243+
extreme_finder,
244+
grid_locator1,
245+
grid_locator2,
246+
tick_formatter1,
247+
tick_formatter2)
253248
self.update_transform(transform)
254249

255250

lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ def __init__(self, grid_helper, side, nth_coord_ticks=None):
2828
nth_coord = 0 -> x axis, nth_coord = 1 -> y axis
2929
"""
3030

31-
super(FixedAxisArtistHelper, self).__init__( \
32-
loc=side,
33-
)
31+
super(FixedAxisArtistHelper, self).__init__(loc=side)
3432

3533
self.grid_helper = grid_helper
3634
if nth_coord_ticks is None:
@@ -412,7 +410,7 @@ def new_floating_axis(self, nth_coord,
412410
if axes is None:
413411
axes = self.axes
414412

415-
_helper = FloatingAxisArtistHelper( \
413+
_helper = FloatingAxisArtistHelper(
416414
self, nth_coord, value, axis_direction)
417415

418416
axisline = AxisArtist(axes, _helper)

lib/mpl_toolkits/mplot3d/art3d.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ def set_3d_properties(self, z=0, zdir='z'):
8181
self.stale = True
8282

8383
def draw(self, renderer):
84-
proj = proj3d.proj_trans_points([self._position3d, \
85-
self._position3d + self._dir_vec], renderer.M)
84+
proj = proj3d.proj_trans_points(
85+
[self._position3d, self._position3d + self._dir_vec], renderer.M)
8686
dx = proj[0][1] - proj[0][0]
8787
dy = proj[1][1] - proj[1][0]
8888
if dx==0. and dy==0.:

pytest.ini

+8-8
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pep8ignore =
5353
matplotlib/testing/jpl_units/UnitDbl.py E201 E202 E203
5454
matplotlib/testing/jpl_units/UnitDblConverter.py E201 E202 E203 E251 E302 E501 E711
5555
matplotlib/testing/jpl_units/UnitDblFormatter.py E201 E202 E251 E302
56-
matplotlib/tests/test_image.py E225 E231 E251 E302 E303 E501 E502
56+
matplotlib/tests/test_image.py E225 E231 E251 E302 E303 E501
5757
matplotlib/tests/test_lines.py E231 E261
5858
matplotlib/tests/test_mathtext.py E261 E302 E501
5959
matplotlib/tests/test_rcparams.py E231 E501
@@ -84,22 +84,22 @@ pep8ignore =
8484
mpl_toolkits/axes_grid1/axes_size.py E225 E261 E302 E303 E501
8585
mpl_toolkits/axes_grid1/colorbar.py E225 E231 E261 E262 E302 E303 E501 E701
8686
mpl_toolkits/axes_grid1/inset_locator.py E501
87-
mpl_toolkits/axes_grid1/mpl_axes.py E302 E303 E501 E502
88-
mpl_toolkits/axes_grid1/parasite_axes.py E225 E231 E302 E303 E402 E501 E502
87+
mpl_toolkits/axes_grid1/mpl_axes.py E302 E303 E501
88+
mpl_toolkits/axes_grid1/parasite_axes.py E225 E231 E302 E303 E402 E501
8989
mpl_toolkits/axisartist/__init__.py E501
90-
mpl_toolkits/axisartist/angle_helper.py E201 E203 E221 E222 E225 E231 E251 E261 E262 E302 E303 E402 E501 E502
90+
mpl_toolkits/axisartist/angle_helper.py E201 E203 E221 E222 E225 E231 E251 E261 E262 E302 E303 E402 E501
9191
mpl_toolkits/axisartist/axes_divider.py E501
9292
mpl_toolkits/axisartist/axes_grid.py E225 E302
9393
mpl_toolkits/axisartist/axes_rgb.py E302 E501
9494
mpl_toolkits/axisartist/axis_artist.py E201 E202 E221 E225 E228 E231 E251 E261 E262 E302 E303 E402 E501 E701 E702 E711
9595
mpl_toolkits/axisartist/axisline_style.py E231 E261 E262 E302 E303
96-
mpl_toolkits/axisartist/axislines.py E225 E231 E261 E262 E302 E303 E501 E502 E711
96+
mpl_toolkits/axisartist/axislines.py E225 E231 E261 E262 E302 E303 E501 E711
9797
mpl_toolkits/axisartist/clip_path.py E225 E228 E302 E303 E501 E502
9898
mpl_toolkits/axisartist/floating_axes.py E201 E225 E231 E261 E262 E271 E302 E303 E402 E501
99-
mpl_toolkits/axisartist/grid_finder.py E231 E261 E302 E303 E402 E501 E502
100-
mpl_toolkits/axisartist/grid_helper_curvelinear.py E221 E225 E231 E251 E261 E262 E271 E302 E303 E501 E502
99+
mpl_toolkits/axisartist/grid_finder.py E231 E261 E302 E303 E402 E501
100+
mpl_toolkits/axisartist/grid_helper_curvelinear.py E221 E225 E231 E251 E261 E262 E271 E302 E303 E501
101101
mpl_toolkits/axisartist/parasite_axes.py E501
102-
mpl_toolkits/mplot3d/art3d.py E203 E222 E225 E231 E501 E502
102+
mpl_toolkits/mplot3d/art3d.py E203 E222 E225 E231 E501
103103
mpl_toolkits/mplot3d/axes3d.py E203 E225 E231 E271 E303 E402 E501 E502 E701
104104
mpl_toolkits/mplot3d/axis3d.py E201 E202 E203 E222 E231 E302 E303 E501 E502
105105
mpl_toolkits/mplot3d/proj3d.py E231 E302 E303

0 commit comments

Comments
 (0)