Skip to content

BUG: bug in comparisons vs tuples, #11339 #11345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/source/whatsnew/v0.17.1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ Bug Fixes

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

- Bug in tz-conversions with an ambiguous time and ``.dt`` accessors (:issues:`11295`)

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

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

Expand Down
2 changes: 1 addition & 1 deletion pandas/core/ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ def wrapper(self, other, axis=None):
res = op(self.values, other)
else:
values = self.get_values()
if is_list_like(other):
if isinstance(other, (list, np.ndarray)):
other = np.asarray(other)

res = na_op(values, other)
Expand Down
37 changes: 37 additions & 0 deletions pandas/tests/test_series.py
Original file line number Diff line number Diff line change
Expand Up @@ -4269,6 +4269,43 @@ def test_object_comparisons(self):
expected = -(s == 'a')
assert_series_equal(result, expected)

def test_comparison_tuples(self):
# GH11339
# comparisons vs tuple
s = Series([(1,1),(1,2)])

result = s == (1,2)
expected = Series([False,True])
assert_series_equal(result, expected)

result = s != (1,2)
expected = Series([True, False])
assert_series_equal(result, expected)

result = s == (0,0)
expected = Series([False, False])
assert_series_equal(result, expected)

result = s != (0,0)
expected = Series([True, True])
assert_series_equal(result, expected)

s = Series([(1,1),(1,1)])

result = s == (1,1)
expected = Series([True, True])
assert_series_equal(result, expected)

result = s != (1,1)
expected = Series([False, False])
assert_series_equal(result, expected)

s = Series([frozenset([1]),frozenset([1,2])])

result = s == frozenset([1])
expected = Series([True, False])
assert_series_equal(result, expected)

def test_comparison_operators_with_nas(self):
s = Series(bdate_range('1/1/2000', periods=10), dtype=object)
s[::2] = np.nan
Expand Down