10BC0 Merge pull request #10593 from anntzer/yieldfrom · matplotlib/matplotlib@59c39ed · GitHub
[go: up one dir, main page]
Skip to content

Commit 59c39ed

Browse files
efiringefiring
authored
Merge pull request #10593 from anntzer/yieldfrom
Use 'yield from' where appropriate.
2 parents 72770e6 + 59663bd commit 59c39ed

File tree

11 files changed

+30
-52
lines changed

11 files changed

+30
-52
lines changed

‎lib/matplotlib/__init__.py‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -967,11 +967,8 @@ def __str__(self):
967967
for k, v in sorted(self.items()))
968968

969969
def __iter__(self):
970-
"""
971-
Yield sorted list of keys.
972-
"""
973-
for k in sorted(dict.__iter__(self)):
974-
yield k
970+
"""Yield sorted list of keys."""
971+
yield from sorted(dict.__iter__(self))
975972

976973
def find_all(self, pattern):
977974
"""
@@ -1015,18 +1012,11 @@ def is_url(filename):
10151012
return URL_REGEX.match(filename) is not None
10161013

10171014

1018-
def _url_lines(f):
1019-
# Compatibility for urlopen in python 3, which yields bytes.
1020-
for line in f:
1021-
yield line.decode('utf8')
1022-
1023-
10241015
@contextlib.contextmanager
10251016
def _open_file_or_url(fname):
10261017
if is_url(fname):
1027-
f = urlopen(fname)
1028-
yield _url_lines(f)
1029-
f.close()
1018+
with urlopen(fname) as f:
1019+
yield (line.decode('utf-8') for line in f)
10301020
else:
10311021
fname = os.path.expanduser(fname)
10321022
encoding = locale.getpreferredencoding(do_setlocale=False)

‎lib/matplotlib/axes/_base.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,7 @@ def _grab_next_args(self, *args, **kwargs):
403403
if args and isinstance(args[0], six.string_types):
404404
this += args[0],
405405
args = args[1:]
406-
for seg in self._plot_args(this, kwargs):
407-
yield seg
406+
yield from self._plot_args(this, kwargs)
408407

409408

410409
class _AxesBase(martist.Artist):

‎lib/matplotlib/axis.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -982,8 +982,7 @@ def iter_ticks(self):
982982
(minorTicks, minorLocs, minorLabels)]
983983

984984
for group in major_minor:
985-
for tick in zip(*group):
986-
yield tick
985+
yield from zip(*group)
987986

988987
def get_ticklabel_extents(self, renderer):
989988
"""

‎lib/matplotlib/cbook/__init__.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -697,8 +697,7 @@ def flatten(seq, scalarp=is_scalar_or_string):
697697
if scalarp(item) or item is None:
698698
yield item
699699
else:
700-
for subitem in flatten(item, scalarp):
701-
yield subitem
700+
yield from flatten(item, scalarp)
702701

703702

704703
@deprecated('2.1', "sorted(..., key=itemgetter(...))")

‎lib/matplotlib/dviread.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -958,8 +958,7 @@ def __init__(self, filename):
958958
_log.debug('Result: %s', self.encoding)
959959

960960
def __iter__(self):
961-
for name in self.encoding:
962-
yield name
961+
yield from self.encoding
963962

964963
def _parse(self, file):
965964
result = []

‎lib/matplotlib/patches.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1706,7 +1706,7 @@ def iter_circle_intersect_on_line_seg(x0, y0, x1, y1):
17061706
x1e += epsilon
17071707
y1e += epsilon
17081708
for x, y in iter_circle_intersect_on_line(x0, y0, x1, y1):
1709-
if x >= x0e and x <= x1e and y >= y0e and y <= y1e:
1709+
if x0e <= x <= x1e and y0e <= y <= y1e:
17101710
yield x, y
17111711

17121712
# Transforms the axes box_path so that it is relative to the unit

‎lib/matplotlib/testing/decorators.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,7 @@ def wrapped_callable(*args, **kwargs):
127127
original_settings = mpl.rcParams.copy()
128128
matplotlib.style.use(style)
129129
try:
130-
for yielded in func(*args, **kwargs):
131-
yield yielded
130+
yield from func(*args, **kwargs)
132131
finally:
133132
_do_cleanup(original_units_registry,
134133
original_settings)
@@ -352,8 +351,7 @@ def __call__(self, func):
352351

353352
@nose.tools.with_setup(self.setup, self.teardown)
354353
def runner_wrapper():
355-
for case in self.nose_runner():
356-
yield case
354+
yield from self.nose_runner()
357355

358356
return _copy_metadata(func, runner_wrapper)
359357

‎lib/matplotlib/transforms.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2448,15 +2448,16 @@ def _invalidate_internal(self, value, invalidating_node):
24482448

24492449
def __eq__(self, other):
24502450
if isinstance(other, (CompositeGenericTransform, CompositeAffine2D)):
2451-
return self is other or (self._a == other._a and self._b == other._b)
2451+
return self is other or (self._a == other._a
2452+
and self._b == other._b)
24522453
else:
24532454
return False
24542455

24552456
def _iter_break_from_left_to_right(self):
2456-
for lh_compliment, rh_compliment in self._a._iter_break_from_left_to_right():
2457-
yield lh_compliment, rh_compliment + self._b
2458-
for lh_compliment, rh_compliment in self._b._iter_break_from_left_to_right():
2459-
yield self._a + lh_compliment, rh_compliment
2457+
for left, right in self._a._iter_break_from_left_to_right():
2458+
yield left, right + self._b
2459+
for left, right in self._b._iter_break_from_left_to_right():
2460+
yield self._a + left, right
24602461

24612462
@property
24622463
def depth(self):
@@ -2557,10 +2558,10 @@ def depth(self):
25572558
return self._a.depth + self._b.depth
25582559

25592560
def _iter_break_from_left_to_right(self):
2560-
for lh_compliment, rh_compliment in self._a._iter_break_from_left_to_right():
2561-
yield lh_compliment, rh_compliment + self._b
2562-
for lh_compliment, rh_compliment in self._b._iter_break_from_left_to_right():
2563-
yield self._a + lh_compliment, rh_compliment
2561+
for left, right in self._a._iter_break_from_left_to_right():
2562+
yield left, right + self._b
2563+
for left, right in self._b._iter_break_from_left_to_right():
2564+
yield self._a + left, right
25642565

25652566
def __str__(self):
25662567
return ("{}(\n"

‎lib/mpl_toolkits/axisartist/axislines.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,9 +372,11 @@ def _f(locs, labels):
372372
c = [self._value, self._value]
373373
c[self.nth_coord] = x
374374
c1, c2 = tr2ax.transform_point(c)
375-
if 0. <= c1 <= 1. and 0. <= c2 <= 1.:
376-
if 0. - self.delta1 <= [c1, c2][self.nth_coord] <= 1. + self.delta2:
377-
yield c, angle_normal, angle_tangent, l
375+
if (0 <= c1 <= 1 and 0 <= c2 <= 1
376+
and 0 - self.delta1
377+
<= [c1, c2][self.nth_coord]
378+
<= 1 + self.delta2):
379+
yield c, angle_normal, angle_tangent, l
378380

379381
return _f(majorLocs, majorLabels), _f(minorLocs, minorLabels)
380382

‎lib/mpl_toolkits/axisartist/floating_axes.py‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -181,16 +181,9 @@ def f1():
181181
for x, y, d, d2, lab in zip(xx1, yy1, dd, dd2, labels):
182182
c2 = tr2ax.transform_point((x, y))
183183
delta=0.00001
184-
if (0. -delta<= c2[0] <= 1.+delta) and \
185-
(0. -delta<= c2[1] <= 1.+delta):
186-
d1 = d/3.14159*180.
187-
d2 = d2/3.14159*180.
188-
#_mod = (d2-d1+180)%360
189-
#if _mod < 180:
190-
# d1 += 180
191-
##_div, _mod = divmod(d2-d1, 360)
184+
if 0-delta <= c2[0] <= 1+delta and 0-delta <= c2[1] <= 1+delta:
185+
d1, d2 = np.rad2deg([d, d2])
192186
yield [x, y], d1, d2, lab
193-
#, d2/3.14159*180.+da)
194187

195188
return f1(), iter([])
196189

0 commit comments

Comments
 (0)
0