From 1dfa25c0b53b7137de11b48c80f7bc8fac1a1796 Mon Sep 17 00:00:00 2001 From: Gerard Jorgensen Date: Thu, 3 Dec 2020 01:47:54 -0800 Subject: [PATCH 1/4] dict call rewritten as literal for test_ujson.py --- pandas/tests/io/json/test_ujson.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pandas/tests/io/json/test_ujson.py b/pandas/tests/io/json/test_ujson.py index 086c0b7ba08b2..133d13e9220c1 100644 --- a/pandas/tests/io/json/test_ujson.py +++ b/pandas/tests/io/json/test_ujson.py @@ -797,9 +797,9 @@ def test_0d_array(self): ([42, {}, "a"], TypeError, {}), ([42, ["a"], 42], ValueError, {}), (["a", "b", [], "c"], ValueError, {}), - ([{"a": "b"}], ValueError, dict(labelled=True)), - ({"a": {"b": {"c": 42}}}, ValueError, dict(labelled=True)), - ([{"a": 42, "b": 23}, {"c": 17}], ValueError, dict(labelled=True)), + ([{"a": "b"}], ValueError, {"labelled": True}), + ({"a": {"b": {"c": 42}}}, ValueError, {"labelled": True}), + ([{"a": 42, "b": 23}, {"c": 17}], ValueError, {"labelled": True}), ], ) def test_array_numpy_except(self, bad_input, exc_type, kwargs): @@ -852,7 +852,7 @@ def test_dataframe(self, orient, numpy): columns=["x", "y", "z"], dtype=dtype, ) - encode_kwargs = {} if orient is None else dict(orient=orient) + encode_kwargs = {} if orient is None else {"orient": orient} decode_kwargs = {} if numpy is None else dict(numpy=numpy) assert (df.dtypes == dtype).all() @@ -884,7 +884,7 @@ def test_dataframe_nested(self, orient): ) nested = {"df1": df, "df2": df.copy()} - kwargs = {} if orient is None else dict(orient=orient) + kwargs = {} if orient is None else {"orient": orient} exp = { "df1": ujson.decode(ujson.encode(df, **kwargs)), @@ -902,7 +902,7 @@ def test_dataframe_numpy_labelled(self, orient): columns=["x", "y", "z"], dtype=int, ) - kwargs = {} if orient is None else dict(orient=orient) + kwargs = {} if orient is None else {"orient": orient} output = DataFrame( *ujson.decode(ujson.encode(df, **kwargs), numpy=True, labelled=True) @@ -925,7 +925,7 @@ def test_series(self, orient, numpy): ).sort_values() assert s.dtype == dtype - encode_kwargs = {} if orient is None else dict(orient=orient) + encode_kwargs = {} if orient is None else {"orient": orient} decode_kwargs = {} if numpy is None else dict(numpy=numpy) output = ujson.decode(ujson.encode(s, **encode_kwargs), **decode_kwargs) @@ -953,7 +953,7 @@ def test_series_nested(self, orient): [10, 20, 30, 40, 50, 60], name="series", index=[6, 7, 8, 9, 10, 15] ).sort_values() nested = {"s1": s, "s2": s.copy()} - kwargs = {} if orient is None else dict(orient=orient) + kwargs = {} if orient is None else {"orient": orient} exp = { "s1": ujson.decode(ujson.encode(s, **kwargs)), From ebe98fa0ba208865b47bb8e4df88acafb6a1b116 Mon Sep 17 00:00:00 2001 From: Gerard Jorgensen Date: Thu, 3 Dec 2020 03:30:44 -0800 Subject: [PATCH 2/4] fixed C408 for test_ujson.py and test_normalize.py --- pandas/tests/io/json/test_normalize.py | 9 ++++++--- pandas/tests/io/json/test_ujson.py | 12 ++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pandas/tests/io/json/test_normalize.py b/pandas/tests/io/json/test_normalize.py index 8d93fbcc063f4..7d18cf0cc60cb 100644 --- a/pandas/tests/io/json/test_normalize.py +++ b/pandas/tests/io/json/test_normalize.py @@ -521,13 +521,13 @@ def test_meta_non_iterable(self): class TestNestedToRecord: def test_flat_stays_flat(self): - recs = [dict(flat1=1, flat2=2), dict(flat1=3, flat2=4)] + recs = [{"flat1": 1, "flat2": 2}, {"flat3": 3, "flat2": 4}] result = nested_to_record(recs) expected = recs assert result == expected def test_one_level_deep_flattens(self): - data = dict(flat1=1, dict1=dict(c=1, d=2)) + data = {"flat1": 1, "dict1": {"c": 1, "d": 2}} result = nested_to_record(data) expected = {"dict1.c": 1, "dict1.d": 2, "flat1": 1} @@ -535,7 +535,10 @@ def test_one_level_deep_flattens(self): assert result == expected def test_nested_flattens(self): - data = dict(flat1=1, dict1=dict(c=1, d=2), nested=dict(e=dict(c=1, d=2), d=2)) + data = { + "flat1": 1, "dict1": {"c": 1, "d": 2}, + "nested": {"e": {"c": 1, "d": 2}, "d": 2} + } result = nested_to_record(data) expected = { diff --git a/pandas/tests/io/json/test_ujson.py b/pandas/tests/io/json/test_ujson.py index 133d13e9220c1..ced0d540f33ef 100644 --- a/pandas/tests/io/json/test_ujson.py +++ b/pandas/tests/io/json/test_ujson.py @@ -757,10 +757,10 @@ def test_array_reshaped(self, shape): def test_array_list(self): arr_list = [ "a", - list(), - dict(), - dict(), - list(), + [], + {}, + {}, + [], 42, 97.8, ["a", "b"], @@ -853,7 +853,7 @@ def test_dataframe(self, orient, numpy): dtype=dtype, ) encode_kwargs = {} if orient is None else {"orient": orient} - decode_kwargs = {} if numpy is None else dict(numpy=numpy) + decode_kwargs = {} if numpy is None else {"numpy": numpy} assert (df.dtypes == dtype).all() output = ujson.decode(ujson.encode(df, **encode_kwargs), **decode_kwargs) @@ -926,7 +926,7 @@ def test_series(self, orient, numpy): assert s.dtype == dtype encode_kwargs = {} if orient is None else {"orient": orient} - decode_kwargs = {} if numpy is None else dict(numpy=numpy) + decode_kwargs = {} if numpy is None else {"numpy": numpy} output = ujson.decode(ujson.encode(s, **encode_kwargs), **decode_kwargs) assert s.dtype == dtype From 58bf355197572e209875a4b64e34a154712d0bf3 Mon Sep 17 00:00:00 2001 From: Gerard Jorgensen Date: Thu, 3 Dec 2020 17:08:08 -0800 Subject: [PATCH 3/4] Fixed formatting issue on test_normalize.py --- pandas/tests/io/json/test_normalize.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandas/tests/io/json/test_normalize.py b/pandas/tests/io/json/test_normalize.py index 7d18cf0cc60cb..29cc5fd76e9a0 100644 --- a/pandas/tests/io/json/test_normalize.py +++ b/pandas/tests/io/json/test_normalize.py @@ -536,7 +536,8 @@ def test_one_level_deep_flattens(self): def test_nested_flattens(self): data = { - "flat1": 1, "dict1": {"c": 1, "d": 2}, + "flat1": 1, + "dict1": {"c": 1, "d": 2}, "nested": {"e": {"c": 1, "d": 2}, "d": 2} } From d0fc32dd12e6416462297383b21a5132cb8f7b94 Mon Sep 17 00:00:00 2001 From: Gerard Jorgensen Date: Thu, 3 Dec 2020 17:24:14 -0800 Subject: [PATCH 4/4] added comma to fix formatting --- pandas/tests/io/json/test_normalize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/io/json/test_normalize.py b/pandas/tests/io/json/test_normalize.py index 29cc5fd76e9a0..244302e34337d 100644 --- a/pandas/tests/io/json/test_normalize.py +++ b/pandas/tests/io/json/test_normalize.py @@ -538,7 +538,7 @@ def test_nested_flattens(self): data = { "flat1": 1, "dict1": {"c": 1, "d": 2}, - "nested": {"e": {"c": 1, "d": 2}, "d": 2} + "nested": {"e": {"c": 1, "d": 2}, "d": 2}, } result = nested_to_record(data)