Skip to content

Commit b1e8129

Browse files
committed
Merge pull request #11345 from jreback/boolean
BUG: bug in comparisons vs tuples, #11339
2 parents 89b4e5b + 84a37c5 commit b1e8129

File tree

3 files changed

+40
-3
lines changed

3 files changed

+40
-3
lines changed

doc/source/whatsnew/v0.17.1.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ Bug Fixes
6464

6565
- Bug in ``HDFStore.select`` when comparing with a numpy scalar in a where clause (:issue:`11283`)
6666

67-
- Bug in tz-conversions with an ambiguous time and ``.dt`` accessors (:issues:`11295`)
68-
67+
- Bug in tz-conversions with an ambiguous time and ``.dt`` accessors (:issue:`11295`)
68+
- Bug in comparisons of Series vs list-likes (:issue:`11339`)
6969

7070
- Bug in list-like indexing with a mixed-integer Index (:issue:`11320`)
7171

pandas/core/ops.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ def wrapper(self, other, axis=None):
720720
res = op(self.values, other)
721721
else:
722722
values = self.get_values()
723-
if is_list_like(other):
723+
if isinstance(other, (list, np.ndarray)):
724724
other = np.asarray(other)
725725

726726
res = na_op(values, other)

pandas/tests/test_series.py

+37
Original file line numberDiff line numberDiff line change
@@ -4269,6 +4269,43 @@ def test_object_comparisons(self):
42694269
expected = -(s == 'a')
42704270
assert_series_equal(result, expected)
42714271

4272+
def test_comparison_tuples(self):
4273+
# GH11339
4274+
# comparisons vs tuple
4275+
s = Series([(1,1),(1,2)])
4276+
4277+
result = s == (1,2)
4278+
expected = Series([False,True])
4279+
assert_series_equal(result, expected)
4280+
4281+
result = s != (1,2)
4282+
expected = Series([True, False])
4283+
assert_series_equal(result, expected)
4284+
4285+
result = s == (0,0)
4286+
expected = Series([False, False])
4287+
assert_series_equal(result, expected)
4288+
4289+
result = s != (0,0)
4290+
expected = Series([True, True])
4291+
assert_series_equal(result, expected)
4292+
4293+
s = Series([(1,1),(1,1)])
4294+
4295+
result = s == (1,1)
4296+
expected = Series([True, True])
4297+
assert_series_equal(result, expected)
4298+
4299+
result = s != (1,1)
4300+
expected = Series([False, False])
4301+
assert_series_equal(result, expected)
4302+
4303+
s = Series([frozenset([1]),frozenset([1,2])])
4304+
4305+
result = s == frozenset([1])
4306+
expected = Series([True, False])
4307+
assert_series_equal(result, expected)
4308+
42724309
def test_comparison_operators_with_nas(self):
42734310
s = Series(bdate_range('1/1/2000', periods=10), dtype=object)
42744311
s[::2] = np.nan

0 commit comments

Comments
 (0)