summaryrefslogtreecommitdiff
path: root/numpy/lib/recfunctions.py
diff options
context:
space:
mode:
authorMike Taves <mwtoews@gmail.com>2020-01-28 13:12:38 +1300
committerSebastian Berg <sebastian@sipsolutions.net>2020-01-27 16:12:38 -0800
commitf398a0df8a2105b2fdeaeab54505451169b0a869 (patch)
treefe041dbec09eb1a303f7b027cc98e7423476de3f /numpy/lib/recfunctions.py
parent6d889e7eca0f7ae6d640c380bd0b604e6530f049 (diff)
downloadnumpy-f398a0df8a2105b2fdeaeab54505451169b0a869.tar.gz
STY: use 'yield from <expr>' for simple cases (#15444)
This PR uses simple cases of PEP 380 to rewrite: for v in g: yield v into: yield from <expr>
Diffstat (limited to 'numpy/lib/recfunctions.py')
-rw-r--r--numpy/lib/recfunctions.py16
1 files changed, 6 insertions, 10 deletions
diff --git a/numpy/lib/recfunctions.py b/numpy/lib/recfunctions.py
index 03c0c82f5..a11d5f2c7 100644
--- a/numpy/lib/recfunctions.py
+++ b/numpy/lib/recfunctions.py
@@ -285,8 +285,7 @@ def _izip_fields_flat(iterable):
"""
for element in iterable:
if isinstance(element, np.void):
- for f in _izip_fields_flat(tuple(element)):
- yield f
+ yield from _izip_fields_flat(tuple(element))
else:
yield element
@@ -299,11 +298,10 @@ def _izip_fields(iterable):
for element in iterable:
if (hasattr(element, '__iter__') and
not isinstance(element, str)):
- for f in _izip_fields(element):
- yield f
+ yield from _izip_fields(element)
elif isinstance(element, np.void) and len(tuple(element)) == 1:
- for f in _izip_fields(element):
- yield f
+ # this statement is the same from the previous expression
+ yield from _izip_fields(element)
else:
yield element
@@ -657,8 +655,7 @@ def rename_fields(base, namemapper):
def _append_fields_dispatcher(base, names, data, dtypes=None,
fill_value=None, usemask=None, asrecarray=None):
yield base
- for d in data:
- yield d
+ yield from data
@array_function_dispatch(_append_fields_dispatcher)
@@ -734,8 +731,7 @@ def append_fields(base, names, data, dtypes=None,
def _rec_append_fields_dispatcher(base, names, data, dtypes=None):
yield base
- for d in data:
- yield d
+ yield from data
@array_function_dispatch(_rec_append_fields_dispatcher)