Skip to content

Commit 492f01f

Browse files
UrielMaDUrielMaD
committed
last dict fixings
1 parent 6adf501 commit 492f01f

File tree

5 files changed

+68
-65
lines changed

5 files changed

+68
-65
lines changed

‎pandas/tests/io/parser/test_header.py

+34-34
Original file line numberDiff line numberDiff line change
@@ -144,19 +144,19 @@ def test_header_multi_index(all_parsers):
144144
"kwargs,msg",
145145
[
146146
(
147-
dict(index_col=["foo", "bar"]),
147+
{"index_col": ["foo", "bar"]},
148148
(
149149
"index_col must only contain "
150150
"row numbers when specifying "
151151
"a multi-index header"
152152
),
153153
),
154154
(
155-
dict(index_col=[0, 1], names=["foo", "bar"]),
155+
{"index_col": [0, 1], "names": ["foo", "bar"]},
156156
("cannot specify names when specifying a multi-index header"),
157157
),
158158
(
159-
dict(index_col=[0, 1], usecols=["foo", "bar"]),
159+
{"index_col": [0, 1], "usecols": ["foo", "bar"]},
160160
("cannot specify usecols when specifying a multi-index header"),
161161
),
162162
],
@@ -187,29 +187,29 @@ def test_header_multi_index_invalid(all_parsers, kwargs, msg):
187187
@pytest.mark.parametrize(
188188
"kwargs",
189189
[
190-
dict(header=[0, 1]),
191-
dict(
192-
skiprows=3,
193-
names=[
190+
{"header": [0, 1]},
191+
{
192+
"skiprows": 3,
193+
"names": [
194194
("a", "q"),
195195
("a", "r"),
196196
("a", "s"),
197197
("b", "t"),
198198
("c", "u"),
199199
("c", "v"),
200200
],
201-
),
202-
dict(
203-
skiprows=3,
204-
names=[
201+
},
202+
{
203+
"skiprows": 3,
204+
"names": [
205205
_TestTuple("a", "q"),
206206
_TestTuple("a", "r"),
207207
_TestTuple("a", "s"),
208208
_TestTuple("b", "t"),
209209
_TestTuple("c", "u"),
210210
_TestTuple("c", "v"),
211211
],
212-
),
212+
},
213213
],
214214
)
215215
def test_header_multi_index_common_format1(all_parsers, kwargs):
@@ -234,29 +234,29 @@ def test_header_multi_index_common_format1(all_parsers, kwargs):
234234
@pytest.mark.parametrize(
235235
"kwargs",
236236
[
237-
dict(header=[0, 1]),
238-
dict(
239-
skiprows=2,
240-
names=[
237+
{"header": [0, 1]},
238+
{
239+
"skiprows": 2,
240+
"names": [
241241
("a", "q"),
242242
("a", "r"),
243243
("a", "s"),
244244
("b", "t"),
245245
("c", "u"),
246246
("c", "v"),
247247
],
248-
),
249-
dict(
250-
skiprows=2,
251-
names=[
248+
},
249+
{
250+
"skiprows": 2,
251+
"names": [
252252
_TestTuple("a", "q"),
253253
_TestTuple("a", "r"),
254254
_TestTuple("a", "s"),
255255
_TestTuple("b", "t"),
256256
_TestTuple("c", "u"),
257257
_TestTuple("c", "v"),
258258
],
259-
),
259+
},
260260
],
261261
)
262262
def test_header_multi_index_common_format2(all_parsers, kwargs):
@@ -280,29 +280,29 @@ def test_header_multi_index_common_format2(all_parsers, kwargs):
280280
@pytest.mark.parametrize(
281281
"kwargs",
282282
[
283-
dict(header=[0, 1]),
284-
dict(
285-
skiprows=2,
286-
names=[
283+
{"header": [0, 1]},
284+
{
285+
"skiprows": 2,
286+
"names": [
287287
("a", "q"),
288288
("a", "r"),
289289
("a", "s"),
290290
("b", "t"),
291291
("c", "u"),
292292
("c", "v"),
293293
],
294-
),
295-
dict(
296-
skiprows=2,
297-
names=[
294+
},
295+
{
296+
"skiprows": 2,
297+
"names": [
298298
_TestTuple("a", "q"),
299299
_TestTuple("a", "r"),
300300
_TestTuple("a", "s"),
301301
_TestTuple("b", "t"),
302302
_TestTuple("c", "u"),
303303
_TestTuple("c", "v"),
304304
],
305-
),
305+
},
306306
],
307307
)
308308
def test_header_multi_index_common_format3(all_parsers, kwargs):
@@ -397,7 +397,7 @@ def test_header_names_backward_compat(all_parsers, data, header):
397397
tm.assert_frame_equal(result, expected)
398398

399399

400-
@pytest.mark.parametrize("kwargs", [dict(), dict(index_col=False)])
400+
@pytest.mark.parametrize("kwargs", [{}, {"index_col": False}])
401401
def test_read_only_header_no_rows(all_parsers, kwargs):
402402
# See gh-7773
403403
parser = all_parsers
@@ -410,10 +410,10 @@ def test_read_only_header_no_rows(all_parsers, kwargs):
410410
@pytest.mark.parametrize(
411411
"kwargs,names",
412412
[
413-
(dict(), [0, 1, 2, 3, 4]),
414-
(dict(prefix="X"), ["X0", "X1", "X2", "X3", "X4"]),
413+
({}, [0, 1, 2, 3, 4]),
414+
({"prefix": "X"}, ["X0", "X1", "X2", "X3", "X4"]),
415415
(
416-
dict(names=["foo", "bar", "baz", "quux", "panda"]),
416+
{"names": ["foo", "bar", "baz", "quux", "panda"]},
417417
["foo", "bar", "baz", "quux", "panda"],
418418
),
419419
],

‎pandas/tests/io/parser/test_index_col.py

+22-18
Original file line numberDiff line numberDiff line change
@@ -86,35 +86,39 @@ def test_infer_index_col(all_parsers):
8686
@pytest.mark.parametrize(
8787
"index_col,kwargs",
8888
[
89-
(None, dict(columns=["x", "y", "z"])),
90-
(False, dict(columns=["x", "y", "z"])),
91-
(0, dict(columns=["y", "z"], index=Index([], name="x"))),
92-
(1, dict(columns=["x", "z"], index=Index([], name="y"))),
93-
("x", dict(columns=["y", "z"], index=Index([], name="x"))),
94-
("y", dict(columns=["x", "z"], index=Index([], name="y"))),
89+
(None, {"columns": ["x", "y", "z"]}),
90+
(False, {"columns": ["x", "y", "z"]}),
91+
(0, {"columns": ["y", "z"], "index": Index([], name="x")}),
92+
(1, {"columns": ["x", "z"], "index": Index([], name="y")}),
93+
("x", {"columns": ["y", "z"], "index": Index([], name="x")}),
94+
("y", {"columns": ["x", "z"], "index": Index([], name="y")}),
9595
(
9696
[0, 1],
97-
dict(
98-
columns=["z"], index=MultiIndex.from_arrays([[]] * 2, names=["x", "y"])
99-
),
97+
{
98+
"columns": ["z"],
99+
"index": MultiIndex.from_arrays([[]] * 2, names=["x", "y"]),
100+
},
100101
),
101102
(
102103
["x", "y"],
103-
dict(
104-
columns=["z"], index=MultiIndex.from_arrays([[]] * 2, names=["x", "y"])
105-
),
104+
{
105+
"columns": ["z"],
106+
"index": MultiIndex.from_arrays([[]] * 2, names=["x", "y"]),
107+
},
106108
),
107109
(
108110
[1, 0],
109-
dict(
110-
columns=["z"], index=MultiIndex.from_arrays([[]] * 2, names=["y", "x"])
111-
),
111+
{
112+
"columns": ["z"],
113+
"index": MultiIndex.from_arrays([[]] * 2, names=["y", "x"]),
114+
},
112115
),
113116
(
114117
["y", "x"],
115-
dict(
116-
columns=["z"], index=MultiIndex.from_arrays([[]] * 2, names=["y", "x"])
117-
),
118+
{
119+
"columns": ["z"],
120+
"index": MultiIndex.from_arrays([[]] * 2, names=["y", "x"]),
121+
},
118122
),
119123
],
120124
)

‎pandas/tests/io/parser/test_na_values.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ def test_na_value_dict_multi_index(all_parsers, index_col, expected):
214214
"kwargs,expected",
215215
[
216216
(
217-
dict(),
217+
{},
218218
DataFrame(
219219
{
220220
"A": ["a", "b", np.nan, "d", "e", np.nan, "g"],
@@ -224,7 +224,7 @@ def test_na_value_dict_multi_index(all_parsers, index_col, expected):
224224
),
225225
),
226226
(
227-
dict(na_values={"A": [], "C": []}, keep_default_na=False),
227+
{"na_values": {"A": [], "C": []}, "keep_default_na": False},
228228
DataFrame(
229229
{
230230
"A": ["a", "b", "", "d", "e", "nan", "g"],
@@ -234,7 +234,7 @@ def test_na_value_dict_multi_index(all_parsers, index_col, expected):
234234
),
235235
),
236236
(
237-
dict(na_values=["a"], keep_default_na=False),
237+
{"na_values": ["a"], "keep_default_na": False},
238238
DataFrame(
239239
{
240240
"A": [np.nan, "b", "", "d", "e", "nan", "g"],
@@ -244,7 +244,7 @@ def test_na_value_dict_multi_index(all_parsers, index_col, expected):
244244
),
245245
),
246246
(
247-
dict(na_values={"A": [], "C": []}),
247+
{"na_values": {"A": [], "C": []}},
248248
DataFrame(
249249
{
250250
"A": ["a", "b", np.nan, "d", "e", np.nan, "g"],
@@ -445,11 +445,11 @@ def test_na_values_dict_col_index(all_parsers):
445445
[
446446
(
447447
str(2 ** 63) + "\n" + str(2 ** 63 + 1),
448-
dict(na_values=[2 ** 63]),
448+
{"na_values": [2 ** 63]},
449449
DataFrame([str(2 ** 63), str(2 ** 63 + 1)]),
450450
),
451-
(str(2 ** 63) + ",1" + "\n,2", dict(), DataFrame([[str(2 ** 63), 1], ["", 2]])),
452-
(str(2 ** 63) + "\n1", dict(na_values=[2 ** 63]), DataFrame([np.nan, 1])),
451+
(str(2 ** 63) + ",1" + "\n,2", {}, DataFrame([[str(2 ** 63), 1], ["", 2]])),
452+
(str(2 ** 63) + "\n1", {"na_values": [2 ** 63]}, DataFrame([np.nan, 1])),
453453
],
454454
)
455455
def test_na_values_uint64(all_parsers, data, kwargs, expected):

‎pandas/tests/io/parser/test_python_parser_only.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def test_invalid_skipfooter_negative(python_parser_only):
4949
parser.read_csv(StringIO(data), skipfooter=-1)
5050

5151

52-
@pytest.mark.parametrize("kwargs", [dict(sep=None), dict(delimiter="|")])
52+
@pytest.mark.parametrize("kwargs", [{"sep": None}, {"delimiter": "|"}])
5353
def test_sniff_delimiter(python_parser_only, kwargs):
5454
data = """index|A|B|C
5555
foo|1|2|3
@@ -122,7 +122,7 @@ def test_single_line(python_parser_only):
122122
tm.assert_frame_equal(result, expected)
123123

124124

125-
@pytest.mark.parametrize("kwargs", [dict(skipfooter=2), dict(nrows=3)])
125+
@pytest.mark.parametrize("kwargs", [{"skipfooter": 2}, {"nrows": 3}])
126126
def test_skipfooter(python_parser_only, kwargs):
127127
# see gh-6607
128128
data = """A,B,C
@@ -213,10 +213,10 @@ def test_skipfooter_with_decimal(python_parser_only, add_footer):
213213
if add_footer:
214214
# The stray footer line should not mess with the
215215
# casting of the first two lines if we skip it.
216-
kwargs = dict(skipfooter=1)
216+
kwargs = {"skipfooter": 1}
217217
data += "\nFooter"
218218
else:
219-
kwargs = dict()
219+
kwargs = {}
220220

221221
result = parser.read_csv(StringIO(data), names=["a"], decimal="#", **kwargs)
222222
tm.assert_frame_equal(result, expected)
@@ -245,7 +245,7 @@ def test_encoding_non_utf8_multichar_sep(python_parser_only, sep, encoding):
245245
@pytest.mark.parametrize("quoting", [csv.QUOTE_MINIMAL, csv.QUOTE_NONE])
246246
def test_multi_char_sep_quotes(python_parser_only, quoting):
247247
# see gh-13374
248-
kwargs = dict(sep=",,")
248+
kwargs = {"sep": ",,"}
249249
parser = python_parser_only
250250

251251
data = 'a,,b\n1,,a\n2,,"2,,b"'

‎setup.cfg

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ ignore =
2222
W504, # line break after binary operator
2323
E402, # module level import not at top of file
2424
E731, # do not assign a lambda expression, use a def
25-
C408, # Unnecessary dict call - rewrite as a literal.
2625
S001 # found modulo formatter (incorrect picks up mod operations)
2726
exclude =
2827
doc/sphinxext/*.py,

0 commit comments

Comments
 (0)