Skip to content

Simplify bool ops closures, improve tests #19795

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.

Sign up for GitHub

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

Closed
wants to merge 12 commits into from
Closed

Simplify bool ops closures, improve tests #19795

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
619d2bb
split bool ops test, parametrize where possible
jbrockmendel Feb 20, 2018
7cf9a7a
remove non-standard imports of nan, inf
jbrockmendel Feb 20, 2018
f5b262b
simplify bool ops closures
jbrockmendel Feb 20, 2018
c03cc55
move whatsnew to breaking changes, revert non-central test diff
jbrockmendel Feb 21, 2018
235f969
Merge branch 'master' of https://github.com/pandas-dev/pandas into bo…
jbrockmendel Feb 21, 2018
9aa41ec
fixup duplicate line
jbrockmendel Feb 21, 2018
e721b64
Merge branch 'master' of https://github.com/pandas-dev/pandas into bo…
jbrockmendel Feb 22, 2018
a591078
reword comment
jbrockmendel Feb 22, 2018
8243ec8
Merge branch 'master' of https://github.com/pandas-dev/pandas into bo…
jbrockmendel Feb 23, 2018
f19a596
use is_list_like
jbrockmendel Feb 23, 2018
f9ff20b
Merge branch 'master' of https://github.com/pandas-dev/pandas into bo…
jbrockmendel Mar 1, 2018
0d99c94
Merge branch 'master' of https://github.com/pandas-dev/pandas into bo…
jbrockmendel Mar 1, 2018
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
Prev Previous commit
Next Next commit
use is_list_like
  • Loading branch information
@jbrockmendel
jbrockmendel committed Feb 23, 2018
commit f19a5961bb3ce313ea733873f2d8b1ae28035f38
2 changes: 1 addition & 1 deletion pandas/core/ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1241,7 +1241,7 @@ def wrapper(self, other):
else:
# scalars, list, tuple, np.array
is_other_int_dtype = is_integer_dtype(np.asarray(other))
if isinstance(other, list):
if is_list_like(other) and not isinstance(other, np.ndarray):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

then thismust be a scalar, put this in another elsif rather than trying to catch the list-like case (ndarray, list, tuple) AND scalar case here

# TODO: Can we do this before the is_integer_dtype check?
# could the is_integer_dtype check be checking the wrong
# thing? e.g. other = [[0, 1], [2, 3], [4, 5]]?
Expand Down