Skip to content

Commit 8680bdd

Browse files
CI: fix flake C413, C414, C416 errors
1 parent 4313267 commit 8680bdd

33 files changed

+68
-81
lines changed

pandas/core/arrays/categorical.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,7 @@ def remove_categories(self, removals, inplace=False):
11101110
if not is_list_like(removals):
11111111
removals = [removals]
11121112

1113-
removal_set = set(list(removals))
1113+
removal_set = set(removals)
11141114
not_included = removal_set - set(self.dtype.categories)
11151115
new_categories = [c for c in self.dtype.categories if c not in removal_set]
11161116

pandas/core/arrays/sparse/scipy_sparse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def _get_label_to_i_dict(labels, sort_labels=False):
5151
"""
5252
labels = Index(map(tuple, labels)).unique().tolist() # squish
5353
if sort_labels:
54-
labels = sorted(list(labels))
54+
labels = sorted(labels)
5555
d = OrderedDict((k, i) for i, k in enumerate(labels))
5656
return d
5757

pandas/core/frame.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4281,7 +4281,7 @@ def set_index(
42814281
arrays = []
42824282
names = []
42834283
if append:
4284-
names = [x for x in self.index.names]
4284+
names = list(self.index.names)
42854285
if isinstance(self.index, ABCMultiIndex):
42864286
for i in range(self.index.nlevels):
42874287
arrays.append(self.index._get_level_values(i))
@@ -7268,7 +7268,7 @@ def _series_round(s, decimals):
72687268
if isinstance(decimals, Series):
72697269
if not decimals.index.is_unique:
72707270
raise ValueError("Index of decimals must be unique")
7271-
new_cols = [col for col in _dict_round(self, decimals)]
7271+
new_cols = list(_dict_round(self, decimals))
72727272
elif is_integer(decimals):
72737273
# Dispatch to Series.round
72747274
new_cols = [_series_round(v, decimals) for _, v in self.items()]

pandas/core/indexes/multi.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ def _verify_integrity(self, codes=None, levels=None):
368368
if not level.is_unique:
369369
raise ValueError(
370370
"Level values must be unique: {values} on "
371-
"level {level}".format(values=[value for value in level], level=i)
371+
"level {level}".format(values=list(level), level=i)
372372
)
373373
if self.sortorder is not None:
374374
if self.sortorder > self._lexsort_depth():
@@ -1992,8 +1992,8 @@ def levshape(self):
19921992
def __reduce__(self):
19931993
"""Necessary for making this object picklable"""
19941994
d = dict(
1995-
levels=[lev for lev in self.levels],
1996-
codes=[level_codes for level_codes in self.codes],
1995+
levels=list(self.levels),
1996+
codes=list(self.codes),
19971997
sortorder=self.sortorder,
19981998
names=list(self.names),
19991999
)

pandas/core/internals/managers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ def get_ftypes(self):
260260
def __getstate__(self):
261261
block_values = [b.values for b in self.blocks]
262262
block_items = [self.items[b.mgr_locs.indexer] for b in self.blocks]
263-
axes_array = [ax for ax in self.axes]
263+
axes_array = list(self.axes)
264264

265265
extra_state = {
266266
"0.14.1": {

pandas/core/tools/datetimes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ def f(value):
857857

858858
# we require at least Ymd
859859
required = ["year", "month", "day"]
860-
req = sorted(list(set(required) - set(unit_rev.keys())))
860+
req = sorted(set(required) - set(unit_rev.keys()))
861861
if len(req):
862862
raise ValueError(
863863
"to assemble mappings requires at least that "
@@ -866,7 +866,7 @@ def f(value):
866866
)
867867

868868
# keys we don't recognize
869-
excess = sorted(list(set(unit_rev.keys()) - set(_unit_map.values())))
869+
excess = sorted(set(unit_rev.keys()) - set(_unit_map.values()))
870870
if len(excess):
871871
raise ValueError(
872872
"extra keys have been passed "

pandas/io/parsers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@ def ix(col):
16051605

16061606
# remove index items from content and columns, don't pop in
16071607
# loop
1608-
for i in reversed(sorted(to_remove)):
1608+
for i in sorted(to_remove, reverse=True):
16091609
data.pop(i)
16101610
if not self._implicit_index:
16111611
columns.pop(i)
@@ -1637,7 +1637,7 @@ def _get_name(icol):
16371637

16381638
# remove index items from content and columns, don't pop in
16391639
# loop
1640-
for c in reversed(sorted(to_remove)):
1640+
for c in sorted(to_remove, reverse=True):
16411641
data.pop(c)
16421642
col_names.remove(c)
16431643

pandas/io/pytables.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1341,7 +1341,7 @@ def info(self) -> str:
13411341
type=type(self), path=pprint_thing(self._path)
13421342
)
13431343
if self.is_open:
1344-
lkeys = sorted(list(self.keys()))
1344+
lkeys = sorted(self.keys())
13451345
if len(lkeys):
13461346
keys = []
13471347
values = []

pandas/tests/api/test_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def check(self, namespace, expected, ignored=None):
1313

1414
result = sorted(f for f in dir(namespace) if not f.startswith("__"))
1515
if ignored is not None:
16-
result = sorted(list(set(result) - set(ignored)))
16+
result = sorted(set(result) - set(ignored))
1717

1818
expected = sorted(expected)
1919
tm.assert_almost_equal(result, expected)

pandas/tests/frame/test_alter_axes.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ def test_set_index_custom_label_hashable_iterable(self):
381381
class Thing(frozenset):
382382
# need to stabilize repr for KeyError (due to random order in sets)
383383
def __repr__(self) -> str:
384-
tmp = sorted(list(self))
384+
tmp = sorted(self)
385385
# double curly brace prints one brace in format string
386386
return "frozenset({{{}}})".format(", ".join(map(repr, tmp)))
387387

@@ -745,8 +745,7 @@ def test_rename_axis_mapper(self):
745745
# GH 19978
746746
mi = MultiIndex.from_product([["a", "b", "c"], [1, 2]], names=["ll", "nn"])
747747
df = DataFrame(
748-
{"x": [i for i in range(len(mi))], "y": [i * 10 for i in range(len(mi))]},
749-
index=mi,
748+
{"x": list(range(len(mi))), "y": [i * 10 for i in range(len(mi))]}, index=mi
750749
)
751750

752751
# Test for rename of the Index object of columns

pandas/tests/frame/test_analytics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1244,7 +1244,7 @@ def test_mode_dropna(self, dropna, expected):
12441244
}
12451245
)
12461246

1247-
result = df[sorted(list(expected.keys()))].mode(dropna=dropna)
1247+
result = df[sorted(expected.keys())].mode(dropna=dropna)
12481248
expected = DataFrame(expected)
12491249
tm.assert_frame_equal(result, expected)
12501250

pandas/tests/frame/test_reshape.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ def verify(df):
699699
for i, j in zip(rows, cols):
700700
left = sorted(df.iloc[i, j].split("."))
701701
right = mk_list(df.index[i]) + mk_list(df.columns[j])
702-
right = sorted(list(map(cast, right)))
702+
right = sorted(map(cast, right))
703703
assert left == right
704704

705705
df = DataFrame(

pandas/tests/groupby/test_function.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,8 +1300,8 @@ def test_size_groupby_all_null():
13001300
([np.nan, 4.0, np.nan, 2.0, np.nan], [np.nan, 4.0, np.nan, 2.0, np.nan]),
13011301
# Timestamps
13021302
(
1303-
[x for x in pd.date_range("1/1/18", freq="D", periods=5)],
1304-
[x for x in pd.date_range("1/1/18", freq="D", periods=5)][::-1],
1303+
list(pd.date_range("1/1/18", freq="D", periods=5)),
1304+
list(pd.date_range("1/1/18", freq="D", periods=5))[::-1],
13051305
),
13061306
# All NA
13071307
([np.nan] * 5, [np.nan] * 5),

pandas/tests/indexes/timedeltas/test_setops.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def test_union_bug_1730(self):
3939
rng_b = timedelta_range("1 day", periods=4, freq="4H")
4040

4141
result = rng_a.union(rng_b)
42-
exp = TimedeltaIndex(sorted(set(list(rng_a)) | set(list(rng_b))))
42+
exp = TimedeltaIndex(sorted(set(rng_a) | set(rng_b)))
4343
tm.assert_index_equal(result, exp)
4444

4545
def test_union_bug_1745(self):
@@ -50,7 +50,7 @@ def test_union_bug_1745(self):
5050
)
5151

5252
result = left.union(right)
53-
exp = TimedeltaIndex(sorted(set(list(left)) | set(list(right))))
53+
exp = TimedeltaIndex(sorted(set(left) | set(right)))
5454
tm.assert_index_equal(result, exp)
5555

5656
def test_union_bug_4564(self):
@@ -59,7 +59,7 @@ def test_union_bug_4564(self):
5959
right = left + pd.offsets.Minute(15)
6060

6161
result = left.union(right)
62-
exp = TimedeltaIndex(sorted(set(list(left)) | set(list(right))))
62+
exp = TimedeltaIndex(sorted(set(left) | set(right)))
6363
tm.assert_index_equal(result, exp)
6464

6565
def test_intersection_bug_1708(self):

pandas/tests/indexing/multiindex/test_loc.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,16 +223,14 @@ def test_loc_getitem_int_slice(self):
223223
# GH 3053
224224
# loc should treat integer slices like label slices
225225

226-
index = MultiIndex.from_tuples(
227-
[t for t in itertools.product([6, 7, 8], ["a", "b"])]
228-
)
226+
index = MultiIndex.from_tuples(list(itertools.product([6, 7, 8], ["a", "b"])))
229227
df = DataFrame(np.random.randn(6, 6), index, index)
230228
result = df.loc[6:8, :]
231229
expected = df
232230
tm.assert_frame_equal(result, expected)
233231

234232
index = MultiIndex.from_tuples(
235-
[t for t in itertools.product([10, 20, 30], ["a", "b"])]
233+
list(itertools.product([10, 20, 30], ["a", "b"]))
236234
)
237235
df = DataFrame(np.random.randn(6, 6), index, index)
238236
result = df.loc[20:30, :]

pandas/tests/indexing/multiindex/test_xs.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,7 @@ def test_xs_integer_key():
160160
# see gh-2107
161161
dates = range(20111201, 20111205)
162162
ids = "abcde"
163-
index = MultiIndex.from_tuples(
164-
[x for x in product(dates, ids)], names=["date", "secid"]
165-
)
163+
index = MultiIndex.from_tuples(list(product(dates, ids)), names=["date", "secid"])
166164
df = DataFrame(np.random.randn(len(index), 3), index, ["X", "Y", "Z"])
167165

168166
result = df.xs(20111201, level="date")

pandas/tests/indexing/test_categorical.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ def test_getitem_with_listlike(self):
472472
[[1, 0], [0, 1]], dtype="uint8", index=[0, 1], columns=cats
473473
)
474474
dummies = pd.get_dummies(cats)
475-
result = dummies[[c for c in dummies.columns]]
475+
result = dummies[list(dummies.columns)]
476476
tm.assert_frame_equal(result, expected)
477477

478478
def test_setitem_listlike(self):

pandas/tests/io/formats/test_to_excel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ def test_css_to_excel_inherited(css, inherited, expected):
262262
@pytest.mark.parametrize(
263263
"input_color,output_color",
264264
(
265-
[(name, rgb) for name, rgb in CSSToExcelConverter.NAMED_COLORS.items()]
265+
list(CSSToExcelConverter.NAMED_COLORS.items())
266266
+ [("#" + rgb, rgb) for rgb in CSSToExcelConverter.NAMED_COLORS.values()]
267267
+ [("#F0F", "FF00FF"), ("#ABC", "AABBCC")]
268268
),

pandas/tests/io/pytables/test_store.py

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2806,16 +2806,16 @@ def test_select_iterator(self, setup_path):
28062806

28072807
expected = store.select("df")
28082808

2809-
results = [s for s in store.select("df", iterator=True)]
2809+
results = list(store.select("df", iterator=True))
28102810
result = concat(results)
28112811
tm.assert_frame_equal(expected, result)
28122812

2813-
results = [s for s in store.select("df", chunksize=100)]
2813+
results = list(store.select("df", chunksize=100))
28142814
assert len(results) == 5
28152815
result = concat(results)
28162816
tm.assert_frame_equal(expected, result)
28172817

2818-
results = [s for s in store.select("df", chunksize=150)]
2818+
results = list(store.select("df", chunksize=150))
28192819
result = concat(results)
28202820
tm.assert_frame_equal(result, expected)
28212821

@@ -2835,7 +2835,7 @@ def test_select_iterator(self, setup_path):
28352835
df = tm.makeTimeDataFrame(500)
28362836
df.to_hdf(path, "df", format="table")
28372837

2838-
results = [s for s in read_hdf(path, "df", chunksize=100)]
2838+
results = list(read_hdf(path, "df", chunksize=100))
28392839
result = concat(results)
28402840

28412841
assert len(results) == 5
@@ -2856,12 +2856,9 @@ def test_select_iterator(self, setup_path):
28562856

28572857
# full selection
28582858
expected = store.select_as_multiple(["df1", "df2"], selector="df1")
2859-
results = [
2860-
s
2861-
for s in store.select_as_multiple(
2862-
["df1", "df2"], selector="df1", chunksize=150
2863-
)
2864-
]
2859+
results = list(
2860+
store.select_as_multiple(["df1", "df2"], selector="df1", chunksize=150)
2861+
)
28652862
result = concat(results)
28662863
tm.assert_frame_equal(expected, result)
28672864

@@ -2916,27 +2913,27 @@ def test_select_iterator_complete_8014(self, setup_path):
29162913
end_dt = expected.index[-1]
29172914

29182915
# select w/iterator and no where clause works
2919-
results = [s for s in store.select("df", chunksize=chunksize)]
2916+
results = list(store.select("df", chunksize=chunksize))
29202917
result = concat(results)
29212918
tm.assert_frame_equal(expected, result)
29222919

29232920
# select w/iterator and where clause, single term, begin of range
29242921
where = "index >= '{beg_dt}'".format(beg_dt=beg_dt)
2925-
results = [s for s in store.select("df", where=where, chunksize=chunksize)]
2922+
results = list(store.select("df", where=where, chunksize=chunksize))
29262923
result = concat(results)
29272924
tm.assert_frame_equal(expected, result)
29282925

29292926
# select w/iterator and where clause, single term, end of range
29302927
where = "index <= '{end_dt}'".format(end_dt=end_dt)
2931-
results = [s for s in store.select("df", where=where, chunksize=chunksize)]
2928+
results = list(store.select("df", where=where, chunksize=chunksize))
29322929
result = concat(results)
29332930
tm.assert_frame_equal(expected, result)
29342931

29352932
# select w/iterator and where clause, inclusive range
29362933
where = "index >= '{beg_dt}' & index <= '{end_dt}'".format(
29372934
beg_dt=beg_dt, end_dt=end_dt
29382935
)
2939-
results = [s for s in store.select("df", where=where, chunksize=chunksize)]
2936+
results = list(store.select("df", where=where, chunksize=chunksize))
29402937
result = concat(results)
29412938
tm.assert_frame_equal(expected, result)
29422939

@@ -2958,14 +2955,14 @@ def test_select_iterator_non_complete_8014(self, setup_path):
29582955

29592956
# select w/iterator and where clause, single term, begin of range
29602957
where = "index >= '{beg_dt}'".format(beg_dt=beg_dt)
2961-
results = [s for s in store.select("df", where=where, chunksize=chunksize)]
2958+
results = list(store.select("df", where=where, chunksize=chunksize))
29622959
result = concat(results)
29632960
rexpected = expected[expected.index >= beg_dt]
29642961
tm.assert_frame_equal(rexpected, result)
29652962

29662963
# select w/iterator and where clause, single term, end of range
29672964
where = "index <= '{end_dt}'".format(end_dt=end_dt)
2968-
results = [s for s in store.select("df", where=where, chunksize=chunksize)]
2965+
results = list(store.select("df", where=where, chunksize=chunksize))
29692966
result = concat(results)
29702967
rexpected = expected[expected.index <= end_dt]
29712968
tm.assert_frame_equal(rexpected, result)
@@ -2974,7 +2971,7 @@ def test_select_iterator_non_complete_8014(self, setup_path):
29742971
where = "index >= '{beg_dt}' & index <= '{end_dt}'".format(
29752972
beg_dt=beg_dt, end_dt=end_dt
29762973
)
2977-
results = [s for s in store.select("df", where=where, chunksize=chunksize)]
2974+
results = list(store.select("df", where=where, chunksize=chunksize))
29782975
result = concat(results)
29792976
rexpected = expected[
29802977
(expected.index >= beg_dt) & (expected.index <= end_dt)
@@ -2992,7 +2989,7 @@ def test_select_iterator_non_complete_8014(self, setup_path):
29922989

29932990
# select w/iterator and where clause, single term, begin of range
29942991
where = "index > '{end_dt}'".format(end_dt=end_dt)
2995-
results = [s for s in store.select("df", where=where, chunksize=chunksize)]
2992+
results = list(store.select("df", where=where, chunksize=chunksize))
29962993
assert 0 == len(results)
29972994

29982995
def test_select_iterator_many_empty_frames(self, setup_path):
@@ -3014,14 +3011,14 @@ def test_select_iterator_many_empty_frames(self, setup_path):
30143011

30153012
# select w/iterator and where clause, single term, begin of range
30163013
where = "index >= '{beg_dt}'".format(beg_dt=beg_dt)
3017-
results = [s for s in store.select("df", where=where, chunksize=chunksize)]
3014+
results = list(store.select("df", where=where, chunksize=chunksize))
30183015
result = concat(results)
30193016
rexpected = expected[expected.index >= beg_dt]
30203017
tm.assert_frame_equal(rexpected, result)
30213018

30223019
# select w/iterator and where clause, single term, end of range
30233020
where = "index <= '{end_dt}'".format(end_dt=end_dt)
3024-
results = [s for s in store.select("df", where=where, chunksize=chunksize)]
3021+
results = list(store.select("df", where=where, chunksize=chunksize))
30253022

30263023
assert len(results) == 1
30273024
result = concat(results)
@@ -3032,7 +3029,7 @@ def test_select_iterator_many_empty_frames(self, setup_path):
30323029
where = "index >= '{beg_dt}' & index <= '{end_dt}'".format(
30333030
beg_dt=beg_dt, end_dt=end_dt
30343031
)
3035-
results = [s for s in store.select("df", where=where, chunksize=chunksize)]
3032+
results = list(store.select("df", where=where, chunksize=chunksize))
30363033

30373034
# should be 1, is 10
30383035
assert len(results) == 1
@@ -3052,7 +3049,7 @@ def test_select_iterator_many_empty_frames(self, setup_path):
30523049
where = "index <= '{beg_dt}' & index >= '{end_dt}'".format(
30533050
beg_dt=beg_dt, end_dt=end_dt
30543051
)
3055-
results = [s for s in store.select("df", where=where, chunksize=chunksize)]
3052+
results = list(store.select("df", where=where, chunksize=chunksize))
30563053

30573054
# should be []
30583055
assert len(results) == 0

pandas/tests/io/sas/test_xport.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def test1_incremental(self):
104104

105105
reader = read_sas(self.file01, index="SEQN", chunksize=1000)
106106

107-
all_data = [x for x in reader]
107+
all_data = list(reader)
108108
data = pd.concat(all_data, axis=0)
109109

110110
tm.assert_frame_equal(data, data_csv, check_index_type=False)

0 commit comments

Comments
 (0)