Skip to content

Commit 862d800

Browse files
DimitriPapadopoulosDimitriPapadopoulos
committed
MAINT: Apply ruff/flake8-comprehensions rule C416
C416 Unnecessary `list` comprehension (rewrite using `list()`)
1 parent f31cc56 commit 862d800

File tree

14 files changed

+39
-39
lines changed

14 files changed

+39
-39
lines changed

‎doc/source/reference/random/performance.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
table = table.T
6060
table = table.reindex(columns)
6161
table = table.T
62-
table = table.reindex([k for k in funcs], axis=0)
62+
table = table.reindex(list(funcs), axis=0)
6363
print(table.to_csv(float_format='%0.1f'))
6464

6565

‎numpy/_core/tests/test_nditer.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@ def test_iter_best_order():
9797
aview = a.reshape(shape)[dirs_index]
9898
# C-order
9999
i = nditer(aview, [], [['readonly']])
100-
assert_equal([x for x in i], a)
100+
assert_equal(list(i), a)
101101
# Fortran-order
102102
i = nditer(aview.T, [], [['readonly']])
103-
assert_equal([x for x in i], a)
103+
assert_equal(list(i), a)
104104
# Other order
105105
if len(shape) > 2:
106106
i = nditer(aview.swapaxes(0, 1), [], [['readonly']])
107-
assert_equal([x for x in i], a)
107+
assert_equal(list(i), a)
108108

109109
def test_iter_c_order():
110110
# Test forcing C order
@@ -123,14 +123,14 @@ def test_iter_c_order():
123123
aview = a.reshape(shape)[dirs_index]
124124
# C-order
125125
i = nditer(aview, order='C')
126-
assert_equal([x for x in i], aview.ravel(order='C'))
126+
assert_equal(list(i), aview.ravel(order='C'))
127127
# Fortran-order
128128
i = nditer(aview.T, order='C')
129-
assert_equal([x for x in i], aview.T.ravel(order='C'))
129+
assert_equal(list(i), aview.T.ravel(order='C'))
130130
# Other order
131131
if len(shape) > 2:
132132
i = nditer(aview.swapaxes(0, 1), order='C')
133-
assert_equal([x for x in i],
133+
assert_equal(list(i),
134134
aview.swapaxes(0, 1).ravel(order='C'))
135135

136136
def test_iter_f_order():
@@ -150,14 +150,14 @@ def test_iter_f_order():
150150
aview = a.reshape(shape)[dirs_index]
151151
# C-order
152152
i = nditer(aview, order='F')
153-
assert_equal([x for x in i], aview.ravel(order='F'))
153+
assert_equal(list(i), aview.ravel(order='F'))
154154
# Fortran-order
155155
i = nditer(aview.T, order='F')
156-
assert_equal([x for x in i], aview.T.ravel(order='F'))
156+
assert_equal(list(i), aview.T.ravel(order='F'))
157157
# Other order
158158
if len(shape) > 2:
159159
i = nditer(aview.swapaxes(0, 1), order='F')
160-
assert_equal([x for x in i],
160+
assert_equal(list(i),
161161
aview.swapaxes(0, 1).ravel(order='F'))
162162

163163
def test_iter_c_or_f_order():
@@ -177,14 +177,14 @@ def test_iter_c_or_f_order():
177177
aview = a.reshape(shape)[dirs_index]
178178
# C-order
179179
i = nditer(aview, order='A')
180-
assert_equal([x for x in i], aview.ravel(order='A'))
180+
assert_equal(list(i), aview.ravel(order='A'))
181181
# Fortran-order
182182
i = nditer(aview.T, order='A')
183-
assert_equal([x for x in i], aview.T.ravel(order='A'))
183+
assert_equal(list(i), aview.T.ravel(order='A'))
184184
# Other order
185185
if len(shape) > 2:
186186
i = nditer(aview.swapaxes(0, 1), order='A')
187-
assert_equal([x for x in i],
187+
assert_equal(list(i),
188188
aview.swapaxes(0, 1).ravel(order='A'))
189189

190190
def test_nditer_multi_index_set():
@@ -195,7 +195,7 @@ def test_nditer_multi_index_set():
195195
# Removes the iteration on two first elements of a[0]
196196
it.multi_index = (0, 2,)
197197

198-
assert_equal([i for i in it], [2, 3, 4, 5])
198+
assert_equal(list(it), [2, 3, 4, 5])
199199

200200
@pytest.mark.skipif(not HAS_REFCOUNT, reason="Python lacks refcounts")
201201
def test_nditer_multi_index_set_refcount():
@@ -1677,12 +1677,12 @@ def test_iter_remove_axis():
16771677

16781678
i = nditer(a, ['multi_index'])
16791679
i.remove_axis(1)
1680-
assert_equal([x for x in i], a[:, 0,:].ravel())
1680+
assert_equal(list(i), a[:, 0,:].ravel())
16811681

16821682
a = a[::-1,:,:]
16831683
i = nditer(a, ['multi_index'])
16841684
i.remove_axis(0)
1685-
assert_equal([x for x in i], a[0,:,:].ravel())
1685+
assert_equal(list(i), a[0,:,:].ravel())
16861686

16871687
def test_iter_remove_multi_index_inner_loop():
16881688
# Check that removing multi-index support works
@@ -1695,9 +1695,9 @@ def test_iter_remove_multi_index_inner_loop():
16951695
assert_equal(i.itviews[0].shape, (2, 3, 4))
16961696

16971697
# Removing the multi-index tracking causes all dimensions to coalesce
1698-
before = [x for x in i]
1698+
before = list(i)
16991699
i.remove_multi_index()
1700-
after = [x for x in i]
1700+
after = list(i)
17011701

17021702
assert_equal(before, after)
17031703
assert_equal(i.ndim, 1)
@@ -2549,7 +2549,7 @@ def test_0d(self):
25492549
vals = []
25502550
for x in i:
25512551
for y in j:
2552-
vals.append([z for z in k])
2552+
vals.append(list(k))
25532553
assert_equal(vals, [[0, 2, 4], [1, 3, 5], [6, 8, 10], [7, 9, 11]])
25542554

25552555
def test_iter_nested_iters_dtype_buffered(self):

‎numpy/_core/tests/test_regression.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ def test_rec_iterate(self):
290290
x = np.rec.array([(1, 1.1, '1.0'),
291291
(2, 2.2, '2.0')], dtype=descr)
292292
x[0].tolist()
293-
[i for i in x[0]]
293+
list(x[0])
294294

295295
def test_unicode_string_comparison(self):
296296
# Ticket #190
@@ -1028,7 +1028,7 @@ def __del__(self):
10281028
def test_mem_fromiter_invalid_dtype_string(self):
10291029
x = [1, 2, 3]
10301030
assert_raises(ValueError,
1031-
np.fromiter, [xi for xi in x], dtype='S')
1031+
np.fromiter, list(x), dtype='S')
10321032

10331033
def test_reduce_big_object_array(self):
10341034
# Ticket #713

‎numpy/f2py/_backends/_meson.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def include_substitution(self) -> None:
117117
def fortran_args_substitution(self) -> None:
118118
if self.fortran_args:
119119
self.substitutions["fortran_args"] = (
120-
f"{self.indent}fortran_args: [{', '.join([arg for arg in self.fortran_args])}],"
120+
f"{self.indent}fortran_args: [{', '.join(list(self.fortran_args))}],"
121121
)
122122
else:
123123
self.substitutions["fortran_args"] = ""

‎numpy/f2py/tests/test_character.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def test_array_input(self, length):
102102
{'1': 'A', '3': 'ABC', 'star': 'ABCDE' * 3}[length],
103103
], dtype='S')
104104

105-
expected = np.array([[c for c in s] for s in a], dtype='u1')
105+
expected = np.array([list(s) for s in a], dtype='u1')
106106
assert_array_equal(f(a), expected)
107107

108108
@pytest.mark.parametrize("length", length_list)
@@ -114,7 +114,7 @@ def test_array_output(self, length):
114114
[{'1': 'a', '3': 'abc', 'star': 'abcde' * 3}[length],
115115
{'1': 'A', '3': 'ABC', 'star': 'ABCDE' * 3}[length]], dtype='S')
116116

117-
a = np.array([[c for c in s] for s in expected], dtype='u1')
117+
a = np.array([list(s) for s in expected], dtype='u1')
118118
assert_array_equal(f(a), expected)
119119

120120
@pytest.mark.parametrize("length", length_list)
@@ -127,7 +127,7 @@ def test_2d_array_input(self, length):
127127
[{'1': 'f', '3': 'fgh', 'star': 'fghij' * 3}[length],
128128
{'1': 'F', '3': 'FGH', 'star': 'FGHIJ' * 3}[length]]],
129129
dtype='S')
130-
expected = np.array([[[c for c in item] for item in row] for row in a],
130+
expected = np.array([[list(item) for item in row] for row in a],
131131
dtype='u1', order='F')
132132
assert_array_equal(f(a), expected)
133133

‎numpy/lib/_arrayterator_impl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def __init__(self, var, buf_size=None):
8888
self.buf_size = buf_size
8989

9090
self.start = [0 for dim in var.shape]
91-
self.stop = [dim for dim in var.shape]
91+
self.stop = list(var.shape)
9292
self.step = [1 for dim in var.shape]
9393

9494
def __getattr__(self, attr):

‎numpy/lib/recfunctions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ def get_fieldstructure(adtype, lastname=None, parents=None,):
267267
parents[name] = []
268268
parents.update(get_fieldstructure(current, name, parents))
269269
else:
270-
lastparent = [_ for _ in (parents.get(lastname, []) or [])]
270+
lastparent = list((parents.get(lastname, []) or []))
271271
if lastparent:
272272
lastparent.append(lastname)
273273
elif lastname:

‎numpy/ma/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1853,7 +1853,7 @@ def _flatsequence(sequence):
18531853

18541854
mask = np.asarray(mask)
18551855
flattened = _flatsequence(_flatmask(mask))
1856-
return np.array([_ for _ in flattened], dtype=bool)
1856+
return np.array(list(flattened), dtype=bool)
18571857

18581858

18591859
def _check_mask_axis(mask, axis, keepdims=np._NoValue):

‎numpy/ma/mrecords.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ def fromtextfile(fname, delimiter=None, commentchar='#', missingchar='',
733733
vartypes = _guessvartypes(_variables[0])
734734

735735
# Construct the descriptor.
736-
mdescr = [(n, f) for (n, f) in zip(varnames, vartypes)]
736+
mdescr = list(zip(varnames, vartypes))
737737
mfillv = [ma.default_fill_value(f) for f in vartypes]
738738

739739
# Get the data and the mask.

‎numpy/ma/tests/test_core.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3789,19 +3789,19 @@ def test_toflex(self):
37893789
assert_equal(record['_mask'], data._mask)
37903790

37913791
ndtype = [('i', int), ('s', '|S3'), ('f', float)]
3792-
data = array([(i, s, f) for (i, s, f) in zip(np.arange(10),
3793-
'ABCDEFGHIJKLM',
3794-
np.random.rand(10))],
3792+
data = array(list(zip(np.arange(10),
3793+
'ABCDEFGHIJKLM',
3794+
np.random.rand(10))),
37953795
dtype=ndtype)
37963796
data[[0, 1, 2, -1]] = masked
37973797
record = data.toflex()
37983798
assert_equal(record['_data'], data._data)
37993799
assert_equal(record['_mask'], data._mask)
38003800

38013801
ndtype = np.dtype("int, (2,3)float, float")
3802-
data = array([(i, f, ff) for (i, f, ff) in zip(np.arange(10),
3803-
np.random.rand(10),
3804-
np.random.rand(10))],
3802+
data = array(list(zip(np.arange(10),
3803+
np.random.rand(10),
3804+
np.random.rand(10))),
38053805
dtype=ndtype)
38063806
data[[0, 1, 2, -1]] = masked
38073807
record = data.toflex()

0 commit comments

Comments
 (0)