Skip to content

Commit 6adf501

Browse files
committed
last dict fixings
1 parent adc2ff8 commit 6adf501

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

pandas/tests/io/parser/test_dialect.py

+15-15
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
@pytest.fixture
1818
def custom_dialect():
1919
dialect_name = "weird"
20-
dialect_kwargs = dict(
21-
doublequote=False,
22-
escapechar="~",
23-
delimiter=":",
24-
skipinitialspace=False,
25-
quotechar="~",
26-
quoting=3,
27-
)
20+
dialect_kwargs = {
21+
"doublequote": False,
22+
"escapechar": "~",
23+
"delimiter": ":",
24+
"skipinitialspace": False,
25+
"quotechar": "~",
26+
"quoting": 3,
27+
}
2828
return dialect_name, dialect_kwargs
2929

3030

@@ -91,7 +91,7 @@ def test_dialect_conflict_except_delimiter(all_parsers, custom_dialect, arg, val
9191
data = "a:b\n1:2"
9292

9393
warning_klass = None
94-
kwds = dict()
94+
kwds = {}
9595

9696
# arg=None tests when we pass in the dialect without any other arguments.
9797
if arg is not None:
@@ -114,12 +114,12 @@ def test_dialect_conflict_except_delimiter(all_parsers, custom_dialect, arg, val
114114
@pytest.mark.parametrize(
115115
"kwargs,warning_klass",
116116
[
117-
(dict(sep=","), None), # sep is default --> sep_override=True
118-
(dict(sep="."), ParserWarning), # sep isn't default --> sep_override=False
119-
(dict(delimiter=":"), None), # No conflict
120-
(dict(delimiter=None), None), # Default arguments --> sep_override=True
121-
(dict(delimiter=","), ParserWarning), # Conflict
122-
(dict(delimiter="."), ParserWarning), # Conflict
117+
({"sep": ","}, None), # sep is default --> sep_override=True
118+
({"sep": "."}, ParserWarning), # sep isn't default --> sep_override=False
119+
({"delimiter": ":"}, None), # No conflict
120+
({"delimiter": None}, None), # Default arguments --> sep_override=True
121+
({"delimiter": ","}, ParserWarning), # Conflict
122+
({"delimiter": "."}, ParserWarning), # Conflict
123123
],
124124
ids=[
125125
"sep-override-true",

pandas/tests/io/parser/test_encoding.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def test_utf16_bom_skiprows(all_parsers, sep, encoding):
4747
",", sep
4848
)
4949
path = f"__{tm.rands(10)}__.csv"
50-
kwargs = dict(sep=sep, skiprows=2)
50+
kwargs = {"sep": sep, "skiprows": 2}
5151
utf8 = "utf-8"
5252

5353
with tm.ensure_clean(path) as path:
@@ -91,17 +91,17 @@ def test_unicode_encoding(all_parsers, csv_dir_path):
9191
"data,kwargs,expected",
9292
[
9393
# Basic test
94-
("a\n1", dict(), DataFrame({"a": [1]})),
94+
("a\n1", {}, DataFrame({"a": [1]})),
9595
# "Regular" quoting
96-
('"a"\n1', dict(quotechar='"'), DataFrame({"a": [1]})),
96+
('"a"\n1', {"quotechar": '"'}, DataFrame({"a": [1]})),
9797
# Test in a data row instead of header
98-
("b\n1", dict(names=["a"]), DataFrame({"a": ["b", "1"]})),
98+
("b\n1", {"names": ["a"]}, DataFrame({"a": ["b", "1"]})),
9999
# Test in empty data row with skipping
100-
("\n1", dict(names=["a"], skip_blank_lines=True), DataFrame({"a": [1]})),
100+
("\n1", {"names": ["a"], "skip_blank_lines": True}, DataFrame({"a": [1]})),
101101
# Test in empty data row without skipping
102102
(
103103
"\n1",
104-
dict(names=["a"], skip_blank_lines=False),
104+
{"names": ["a"], "skip_blank_lines": False},
105105
DataFrame({"a": [np.nan, 1]}),
106106
),
107107
],

pandas/tests/io/parser/test_skiprows.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ def test_skip_rows_blank(all_parsers):
9393
2,"line 21
9494
line 22",2
9595
3,"line 31",1""",
96-
dict(skiprows=[1]),
96+
{"skiprows": [1]},
9797
DataFrame(
9898
[[2, "line 21\nline 22", 2], [3, "line 31", 1]],
9999
columns=["id", "text", "num_lines"],
100100
),
101101
),
102102
(
103103
"a,b,c\n~a\n b~,~e\n d~,~f\n f~\n1,2,~12\n 13\n 14~",
104-
dict(quotechar="~", skiprows=[2]),
104+
{"quotechar": "~", "skiprows": [2]},
105105
DataFrame([["a\n b", "e\n d", "f\n f"]], columns=["a", "b", "c"]),
106106
),
107107
(
@@ -111,7 +111,7 @@ def test_skip_rows_blank(all_parsers):
111111
"example\n sentence\n two~,url2\n~"
112112
"example\n sentence\n three~,url3"
113113
),
114-
dict(quotechar="~", skiprows=[1, 3]),
114+
{"quotechar": "~", "skiprows": [1, 3]},
115115
DataFrame([["example\n sentence\n two", "url2"]], columns=["Text", "url"]),
116116
),
117117
],
@@ -222,8 +222,8 @@ def test_skiprows_infield_quote(all_parsers):
222222
@pytest.mark.parametrize(
223223
"kwargs,expected",
224224
[
225-
(dict(), DataFrame({"1": [3, 5]})),
226-
(dict(header=0, names=["foo"]), DataFrame({"foo": [3, 5]})),
225+
({}, DataFrame({"1": [3, 5]})),
226+
({"header": 0, "names": ["foo"]}, DataFrame({"foo": [3, 5]})),
227227
],
228228
)
229229
def test_skip_rows_callable(all_parsers, kwargs, expected):

0 commit comments

Comments
 (0)