Skip to content

Commit 2b186fd

Browse files
committed
1 parent 2175f39 commit 2b186fd

File tree

1 file changed

+36
-29
lines changed

1 file changed

+36
-29
lines changed

pandas/tests/series/methods/test_compare.py

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -153,44 +153,51 @@ class Thing(Enum):
153153
SECOND = auto()
154154

155155
left = pd.Series([Thing.FIRST, Thing.SECOND])
156+
py_l = [Thing.FIRST, Thing.SECOND]
156157

157-
result_scalar = left.eq(Thing.FIRST)
158-
expected_scalar = left == Thing.FIRST
159-
tm.assert_series_equal(result_scalar, expected_scalar)
158+
result = left.eq(Thing.FIRST)
159+
expected = pd.Series([True, False])
160+
tm.assert_series_equal(result, expected)
160161

161-
py_l = [Thing.FIRST, Thing.SECOND]
162-
result_py_l = left.eq(py_l)
163-
expected_py_l = left == py_l
164-
tm.assert_series_equal(result_py_l, expected_py_l)
165-
166-
np_a = np.asarray(py_l)
167-
result_np_a = left.eq(np_a)
168-
expected_np_a = left == np_a
169-
tm.assert_series_equal(result_np_a, expected_np_a)
170-
171-
pd_s = pd.Series(py_l)
172-
result_pd_s = left.eq(pd_s)
173-
expected_pd_s = left == pd_s
174-
tm.assert_series_equal(result_pd_s, expected_pd_s)
175-
176-
left_non_scalar = pd.Series([[1, 2], [3, 4]])
177-
result_non_scalar = left_non_scalar.eq([1, 2])
178-
expected_would_be = pd.Series([True, False])
162+
result = left.eq(py_l)
163+
expected = pd.Series([True, True])
164+
tm.assert_series_equal(result, expected)
165+
166+
result = left.eq(np.asarray(py_l))
167+
expected = pd.Series([True, True])
168+
tm.assert_series_equal(result, expected)
169+
170+
result = left.eq(pd.Series(py_l))
171+
expected = pd.Series([True, True])
172+
tm.assert_series_equal(result, expected)
173+
174+
result = pd.Series([[1, 2], [3, 4]]).eq([1, 2])
175+
expected = pd.Series([True, False])
179176
with pytest.raises(AssertionError):
180-
tm.assert_series_equal(result_non_scalar, expected_would_be)
177+
tm.assert_series_equal(result, expected)
178+
expected = pd.Series([False, False])
179+
tm.assert_series_equal(result, expected)
181180

182181

183182
def test_eq_with_index():
184183
# GH#62191 Test eq with non-trivial indices
185184
left = pd.Series([1, 2], index=[1, 0])
186-
187185
py_l = [1, 2]
188-
tm.assert_series_equal(left.eq(py_l), left == py_l)
189186

190-
np_a = np.asarray(py_l)
191-
tm.assert_series_equal(left.eq(np_a), left == np_a)
187+
# assuming Python list has the same index as the Series
188+
result = left.eq(py_l)
189+
expected = pd.Series([True, True], index=[1, 0])
190+
tm.assert_series_equal(result, expected)
191+
192+
# assuming np.ndarray has the same index as the Series
193+
result = left.eq(np.asarray(py_l))
194+
expected = pd.Series([True, True], index=[1, 0])
195+
tm.assert_series_equal(result, expected)
192196

193-
pd_s = pd.Series(py_l)
194-
tm.assert_series_equal(left.eq(pd_s), pd.Series([False, False]))
197+
result = left.eq(pd.Series(py_l))
198+
expected = pd.Series([False, False])
199+
tm.assert_series_equal(result, expected)
195200

196-
tm.assert_series_equal(left.eq(pd.Series([2, 1])), pd.Series([True, True]))
201+
result = left.eq(pd.Series([2, 1]))
202+
expected = pd.Series([True, True])
203+
tm.assert_series_equal(result, expected)

0 commit comments

Comments
 (0)