Skip to content

Commit c22e9d7

Browse files
authored
CLN: fix E741 ambiguous variable #34150 (#38009)
1 parent 24e881d commit c22e9d7

File tree

27 files changed

+152
-139
lines changed

27 files changed

+152
-139
lines changed

asv_bench/benchmarks/reshape.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,10 @@ def setup(self):
103103
nidvars = 20
104104
N = 5000
105105
self.letters = list("ABCD")
106-
yrvars = [l + str(num) for l, num in product(self.letters, range(1, nyrs + 1))]
106+
yrvars = [
107+
letter + str(num)
108+
for letter, num in product(self.letters, range(1, nyrs + 1))
109+
]
107110
columns = [str(i) for i in range(nidvars)] + yrvars
108111
self.df = DataFrame(np.random.randn(N, nidvars + len(yrvars)), columns=columns)
109112
self.df["id"] = self.df.index

pandas/_testing.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -749,19 +749,19 @@ def assert_index_equal(
749749
"""
750750
__tracebackhide__ = True
751751

752-
def _check_types(l, r, obj="Index"):
752+
def _check_types(left, right, obj="Index"):
753753
if exact:
754-
assert_class_equal(l, r, exact=exact, obj=obj)
754+
assert_class_equal(left, right, exact=exact, obj=obj)
755755

756756
# Skip exact dtype checking when `check_categorical` is False
757757
if check_categorical:
758-
assert_attr_equal("dtype", l, r, obj=obj)
758+
assert_attr_equal("dtype", left, right, obj=obj)
759759

760760
# allow string-like to have different inferred_types
761-
if l.inferred_type in ("string"):
762-
assert r.inferred_type in ("string")
761+
if left.inferred_type in ("string"):
762+
assert right.inferred_type in ("string")
763763
else:
764-
assert_attr_equal("inferred_type", l, r, obj=obj)
764+
assert_attr_equal("inferred_type", left, right, obj=obj)
765765

766766
def _get_ilevel_values(index, level):
767767
# accept level number only
@@ -1147,9 +1147,9 @@ def _raise(left, right, err_msg):
11471147
)
11481148

11491149
diff = 0
1150-
for l, r in zip(left, right):
1150+
for left_arr, right_arr in zip(left, right):
11511151
# count up differences
1152-
if not array_equivalent(l, r, strict_nan=strict_nan):
1152+
if not array_equivalent(left_arr, right_arr, strict_nan=strict_nan):
11531153
diff += 1
11541154

11551155
diff = diff * 100.0 / left.size

pandas/core/common.py

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ class SettingWithCopyWarning(Warning):
4242
pass
4343

4444

45-
def flatten(l):
45+
def flatten(line):
4646
"""
4747
Flatten an arbitrarily nested sequence.
4848
4949
Parameters
5050
----------
51-
l : sequence
51+
line : sequence
5252
The non string sequence to flatten
5353
5454
Notes
@@ -59,11 +59,11 @@ def flatten(l):
5959
-------
6060
flattened : generator
6161
"""
62-
for el in l:
63-
if iterable_not_string(el):
64-
yield from flatten(el)
62+
for element in line:
63+
if iterable_not_string(element):
64+
yield from flatten(element)
6565
else:
66-
yield el
66+
yield element
6767

6868

6969
def consensus_name_attr(objs):
@@ -282,20 +282,23 @@ def is_null_slice(obj) -> bool:
282282
)
283283

284284

285-
def is_true_slices(l):
285+
def is_true_slices(line):
286286
"""
287-
Find non-trivial slices in "l": return a list of booleans with same length.
287+
Find non-trivial slices in "line": return a list of booleans with same length.
288288
"""
289-
return [isinstance(k, slice) and not is_null_slice(k) for k in l]
289+
return [isinstance(k, slice) and not is_null_slice(k) for k in line]
290290

291291

292292
# TODO: used only once in indexing; belongs elsewhere?
293-
def is_full_slice(obj, l) -> bool:
293+
def is_full_slice(obj, line) -> bool:
294294
"""
295295
We have a full length slice.
296296
"""
297297
return (
298-
isinstance(obj, slice) and obj.start == 0 and obj.stop == l and obj.step is None
298+
isinstance(obj, slice)
299+
and obj.start == 0
300+
and obj.stop == line
301+
and obj.step is None
299302
)
300303

301304

pandas/core/dtypes/concat.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@
2121
from pandas.core.construction import array
2222

2323

24-
def _get_dtype_kinds(l) -> Set[str]:
24+
def _get_dtype_kinds(arrays) -> Set[str]:
2525
"""
2626
Parameters
2727
----------
28-
l : list of arrays
28+
arrays : list of arrays
2929
3030
Returns
3131
-------
3232
set[str]
3333
A set of kinds that exist in this list of arrays.
3434
"""
3535
typs: Set[str] = set()
36-
for arr in l:
36+
for arr in arrays:
3737
# Note: we use dtype.kind checks because they are much more performant
3838
# than is_foo_dtype
3939

pandas/core/frame.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ def _repr_fits_horizontal_(self, ignore_width: bool = False) -> bool:
726726

727727
d.to_string(buf=buf)
728728
value = buf.getvalue()
729-
repr_width = max(len(l) for l in value.split("\n"))
729+
repr_width = max(len(line) for line in value.split("\n"))
730730

731731
return repr_width < width
732732

@@ -5962,13 +5962,16 @@ def _dispatch_frame_op(self, right, func, axis: Optional[int] = None):
59625962
# maybe_align_as_frame ensures we do not have an ndarray here
59635963
assert not isinstance(right, np.ndarray)
59645964

5965-
arrays = [array_op(l, r) for l, r in zip(self._iter_column_arrays(), right)]
5965+
arrays = [
5966+
array_op(_left, _right)
5967+
for _left, _right in zip(self._iter_column_arrays(), right)
5968+
]
59665969

59675970
elif isinstance(right, Series):
59685971
assert right.index.equals(self.index) # Handle other cases later
59695972
right = right._values
59705973

5971-
arrays = [array_op(l, right) for l in self._iter_column_arrays()]
5974+
arrays = [array_op(left, right) for left in self._iter_column_arrays()]
59725975

59735976
else:
59745977
# Remaining cases have less-obvious dispatch rules

pandas/core/indexes/multi.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,7 +1063,7 @@ def set_codes(self, codes, level=None, inplace=None, verify_integrity=True):
10631063
def _engine(self):
10641064
# Calculate the number of bits needed to represent labels in each
10651065
# level, as log2 of their sizes (including -1 for NaN):
1066-
sizes = np.ceil(np.log2([len(l) + 1 for l in self.levels]))
1066+
sizes = np.ceil(np.log2([len(level) + 1 for level in self.levels]))
10671067

10681068
# Sum bit counts, starting from the _right_....
10691069
lev_bits = np.cumsum(sizes[::-1])[::-1]
@@ -1217,10 +1217,10 @@ def dtype(self) -> np.dtype:
12171217
def _is_memory_usage_qualified(self) -> bool:
12181218
""" return a boolean if we need a qualified .info display """
12191219

1220-
def f(l):
1221-
return "mixed" in l or "string" in l or "unicode" in l
1220+
def f(level):
1221+
return "mixed" in level or "string" in level or "unicode" in level
12221222

1223-
return any(f(l) for l in self._inferred_type_levels)
1223+
return any(f(level) for level in self._inferred_type_levels)
12241224

12251225
@doc(Index.memory_usage)
12261226
def memory_usage(self, deep: bool = False) -> int:

pandas/core/reshape/reshape.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def _indexer_and_to_sort(self):
137137
@cache_readonly
138138
def sorted_labels(self):
139139
indexer, to_sort = self._indexer_and_to_sort
140-
return [l.take(indexer) for l in to_sort]
140+
return [line.take(indexer) for line in to_sort]
141141

142142
def _make_sorted_values(self, values: np.ndarray) -> np.ndarray:
143143
indexer, _ = self._indexer_and_to_sort

pandas/io/formats/format.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ def _get_formatted_column_labels(self, frame: "DataFrame") -> List[List[str]]:
829829
dtypes = self.frame.dtypes._values
830830

831831
# if we have a Float level, they don't use leading space at all
832-
restrict_formatting = any(l.is_floating for l in columns.levels)
832+
restrict_formatting = any(level.is_floating for level in columns.levels)
833833
need_leadsp = dict(zip(fmt_columns, map(is_numeric_dtype, dtypes)))
834834

835835
def space_format(x, y):

pandas/io/parsers.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2974,9 +2974,9 @@ def _check_comments(self, lines):
29742974
if self.comment is None:
29752975
return lines
29762976
ret = []
2977-
for l in lines:
2977+
for line in lines:
29782978
rl = []
2979-
for x in l:
2979+
for x in line:
29802980
if not isinstance(x, str) or self.comment not in x:
29812981
rl.append(x)
29822982
else:
@@ -3003,14 +3003,14 @@ def _remove_empty_lines(self, lines):
30033003
The same array of lines with the "empty" ones removed.
30043004
"""
30053005
ret = []
3006-
for l in lines:
3006+
for line in lines:
30073007
# Remove empty lines and lines with only one whitespace value
30083008
if (
3009-
len(l) > 1
3010-
or len(l) == 1
3011-
and (not isinstance(l[0], str) or l[0].strip())
3009+
len(line) > 1
3010+
or len(line) == 1
3011+
and (not isinstance(line[0], str) or line[0].strip())
30123012
):
3013-
ret.append(l)
3013+
ret.append(line)
30143014
return ret
30153015

30163016
def _check_thousands(self, lines):
@@ -3023,9 +3023,9 @@ def _check_thousands(self, lines):
30233023

30243024
def _search_replace_num_columns(self, lines, search, replace):
30253025
ret = []
3026-
for l in lines:
3026+
for line in lines:
30273027
rl = []
3028-
for i, x in enumerate(l):
3028+
for i, x in enumerate(line):
30293029
if (
30303030
not isinstance(x, str)
30313031
or search not in x

pandas/io/pytables.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4689,7 +4689,7 @@ def read(
46894689

46904690
# remove names for 'level_%d'
46914691
df.index = df.index.set_names(
4692-
[None if self._re_levels.search(l) else l for l in df.index.names]
4692+
[None if self._re_levels.search(name) else name for name in df.index.names]
46934693
)
46944694

46954695
return df

pandas/plotting/_matplotlib/boxplot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ def _make_plot(self):
149149
self.maybe_color_bp(bp)
150150
self._return_obj = ret
151151

152-
labels = [l for l, _ in self._iter_data()]
153-
labels = [pprint_thing(l) for l in labels]
152+
labels = [left for left, _ in self._iter_data()]
153+
labels = [pprint_thing(left) for left in labels]
154154
if not self.use_index:
155155
labels = [pprint_thing(key) for key in range(len(labels))]
156156
self._set_ticklabels(ax, labels)

pandas/plotting/_matplotlib/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1580,7 +1580,7 @@ def blank_labeler(label, value):
15801580
# Blank out labels for values of 0 so they don't overlap
15811581
# with nonzero wedges
15821582
if labels is not None:
1583-
blabels = [blank_labeler(l, value) for l, value in zip(labels, y)]
1583+
blabels = [blank_labeler(left, value) for left, value in zip(labels, y)]
15841584
else:
15851585
# pandas\plotting\_matplotlib\core.py:1546: error: Incompatible
15861586
# types in assignment (expression has type "None", variable has

pandas/plotting/_matplotlib/tools.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,8 @@ def get_all_lines(ax: "Axes") -> List["Line2D"]:
444444

445445
def get_xlim(lines: Iterable["Line2D"]) -> Tuple[float, float]:
446446
left, right = np.inf, -np.inf
447-
for l in lines:
448-
x = l.get_xdata(orig=False)
447+
for line in lines:
448+
x = line.get_xdata(orig=False)
449449
left = min(np.nanmin(x), left)
450450
right = max(np.nanmax(x), right)
451451
return left, right

pandas/tests/extension/test_interval.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525

2626
def make_data():
2727
N = 100
28-
left = np.random.uniform(size=N).cumsum()
29-
right = left + np.random.uniform(size=N)
30-
return [Interval(l, r) for l, r in zip(left, right)]
28+
left_array = np.random.uniform(size=N).cumsum()
29+
right_array = left_array + np.random.uniform(size=N)
30+
return [Interval(left, right) for left, right in zip(left_array, right_array)]
3131

3232

3333
@pytest.fixture

pandas/tests/frame/methods/test_to_dict.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ def test_to_dict(self, mapping):
118118
]
119119
assert isinstance(recons_data, list)
120120
assert len(recons_data) == 3
121-
for l, r in zip(recons_data, expected_records):
122-
tm.assert_dict_equal(l, r)
121+
for left, right in zip(recons_data, expected_records):
122+
tm.assert_dict_equal(left, right)
123123

124124
# GH#10844
125125
recons_data = DataFrame(test_data).to_dict("index")

pandas/tests/indexes/interval/test_constructors.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ def get_kwargs_from_breaks(self, breaks, closed="right"):
339339
return {"data": breaks}
340340

341341
ivs = [
342-
Interval(l, r, closed) if notna(l) else l
343-
for l, r in zip(breaks[:-1], breaks[1:])
342+
Interval(left, right, closed) if notna(left) else left
343+
for left, right in zip(breaks[:-1], breaks[1:])
344344
]
345345

346346
if isinstance(breaks, list):

pandas/tests/indexes/interval/test_interval.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ def test_properties(self, closed):
5454

5555
assert index.closed == closed
5656

57-
ivs = [Interval(l, r, closed) for l, r in zip(range(10), range(1, 11))]
57+
ivs = [
58+
Interval(left, right, closed)
59+
for left, right in zip(range(10), range(1, 11))
60+
]
5861
expected = np.array(ivs, dtype=object)
5962
tm.assert_numpy_array_equal(np.asarray(index), expected)
6063

@@ -74,8 +77,8 @@ def test_properties(self, closed):
7477
assert index.closed == closed
7578

7679
ivs = [
77-
Interval(l, r, closed) if notna(l) else np.nan
78-
for l, r in zip(expected_left, expected_right)
80+
Interval(left, right, closed) if notna(left) else np.nan
81+
for left, right in zip(expected_left, expected_right)
7982
]
8083
expected = np.array(ivs, dtype=object)
8184
tm.assert_numpy_array_equal(np.asarray(index), expected)

pandas/tests/indexes/multi/test_indexing.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -817,8 +817,8 @@ def test_pyint_engine():
817817
# integers, rather than uint64.
818818
N = 5
819819
keys = [
820-
tuple(l)
821-
for l in [
820+
tuple(arr)
821+
for arr in [
822822
[0] * 10 * N,
823823
[1] * 10 * N,
824824
[2] * 10 * N,

0 commit comments

Comments
 (0)