From 25ff4534229c142491e007fde0231191a70eeee7 Mon Sep 17 00:00:00 2001 From: Qbiwan Date: Wed, 2 Dec 2020 11:34:10 +0800 Subject: [PATCH 1/3] changed to literal --- pandas/tests/frame/indexing/test_indexing.py | 4 ++-- pandas/tests/frame/indexing/test_where.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pandas/tests/frame/indexing/test_indexing.py b/pandas/tests/frame/indexing/test_indexing.py index e33009f4597f0..5127c0c3f9cf9 100644 --- a/pandas/tests/frame/indexing/test_indexing.py +++ b/pandas/tests/frame/indexing/test_indexing.py @@ -73,8 +73,8 @@ def test_getitem_dupe_cols(self): iter, Index, set, - lambda l: dict(zip(l, range(len(l)))), - lambda l: dict(zip(l, range(len(l)))).keys(), + lambda l: {zip(l, range(len(l)))}, + lambda l: {zip(l, range(len(l)))}.keys(), ], ids=["list", "iter", "Index", "set", "dict", "dict_keys"], ) diff --git a/pandas/tests/frame/indexing/test_where.py b/pandas/tests/frame/indexing/test_where.py index 3495247585236..e220615ae8ae4 100644 --- a/pandas/tests/frame/indexing/test_where.py +++ b/pandas/tests/frame/indexing/test_where.py @@ -29,7 +29,7 @@ def is_ok(s): issubclass(s.dtype.type, (np.integer, np.floating)) and s.dtype != "uint8" ) - return DataFrame(dict((c, s + 1) if is_ok(s) else (c, s) for c, s in df.items())) + return DataFrame({(c, s + 1) if is_ok(s) else (c, s) for c, s in df.items()}) class TestDataFrameIndexingWhere: From f6d58dffae6f9b8fab5f11ef526b1c5d35b89ec0 Mon Sep 17 00:00:00 2001 From: Qbiwan Date: Fri, 4 Dec 2020 10:32:05 +0800 Subject: [PATCH 2/3] change to dict comprehension --- pandas/tests/frame/indexing/test_indexing.py | 4 ++-- pandas/tests/frame/indexing/test_where.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pandas/tests/frame/indexing/test_indexing.py b/pandas/tests/frame/indexing/test_indexing.py index 5127c0c3f9cf9..c8a4103347477 100644 --- a/pandas/tests/frame/indexing/test_indexing.py +++ b/pandas/tests/frame/indexing/test_indexing.py @@ -73,8 +73,8 @@ def test_getitem_dupe_cols(self): iter, Index, set, - lambda l: {zip(l, range(len(l)))}, - lambda l: {zip(l, range(len(l)))}.keys(), + lambda l: {index: value for index, value in zip(l, range(len(l)))}, + lambda l: {index: value for index, value in zip(l, range(len(l)))}.keys(), ], ids=["list", "iter", "Index", "set", "dict", "dict_keys"], ) diff --git a/pandas/tests/frame/indexing/test_where.py b/pandas/tests/frame/indexing/test_where.py index e220615ae8ae4..df6fc1eff86a9 100644 --- a/pandas/tests/frame/indexing/test_where.py +++ b/pandas/tests/frame/indexing/test_where.py @@ -29,7 +29,7 @@ def is_ok(s): issubclass(s.dtype.type, (np.integer, np.floating)) and s.dtype != "uint8" ) - return DataFrame({(c, s + 1) if is_ok(s) else (c, s) for c, s in df.items()}) + return DataFrame({c: (s + 1) if is_ok(s) else (c, s) for c, s in df.items()}) class TestDataFrameIndexingWhere: From 1cfd8b918c40ee52cf6ede3f3851ec37b7d4fb48 Mon Sep 17 00:00:00 2001 From: Qbiwan Date: Fri, 4 Dec 2020 13:55:02 +0800 Subject: [PATCH 3/3] change to s + 1 --- pandas/tests/frame/indexing/test_where.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/frame/indexing/test_where.py b/pandas/tests/frame/indexing/test_where.py index df6fc1eff86a9..f8cd73e0d0e3b 100644 --- a/pandas/tests/frame/indexing/test_where.py +++ b/pandas/tests/frame/indexing/test_where.py @@ -29,7 +29,7 @@ def is_ok(s): issubclass(s.dtype.type, (np.integer, np.floating)) and s.dtype != "uint8" ) - return DataFrame({c: (s + 1) if is_ok(s) else (c, s) for c, s in df.items()}) + return DataFrame({c: s + 1 if is_ok(s) else (c, s) for c, s in df.items()}) class TestDataFrameIndexingWhere: