-
-
Notifications
You must be signed in to change notification settings - Fork 18.6k
BUG: is_scalar_indexer #32850
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
jbrockmendel
merged 5 commits into
pandas-dev:master
from
jbrockmendel:setitem-exact_match
Mar 20, 2020
Merged
BUG: is_scalar_indexer #32850
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
9299b81
BUG: is_scalar_indexer
jbrockmendel 0ed3c89
Merge branch 'master' of https://github.com/pandas-dev/pandas into se…
jbrockmendel 8d9b66b
update docstring
jbrockmendel 39339e7
Merge branch 'master' of https://github.com/pandas-dev/pandas into se…
jbrockmendel c9a4059
add copy=False
jbrockmendel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -883,7 +883,7 @@ def setitem(self, indexer, value): | |
# GH#8669 empty indexers | ||
pass | ||
|
||
elif is_scalar_indexer(indexer, arr_value): | ||
elif is_scalar_indexer(indexer, self.ndim): | ||
# setting a single element for each dim and with a rhs that could | ||
# be e.g. a list; see GH#6043 | ||
values[indexer] = value | ||
|
@@ -901,12 +901,10 @@ def setitem(self, indexer, value): | |
# if we are an exact match (ex-broadcasting), | ||
# then use the resultant dtype | ||
elif exact_match: | ||
# We are setting _all_ of the array's values, so can cast to new dtype | ||
values[indexer] = value | ||
|
||
try: | ||
values = values.astype(arr_value.dtype) | ||
except ValueError: | ||
pass | ||
values = values.astype(arr_value.dtype) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can add copy=False here I think |
||
|
||
# set | ||
else: | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,28 @@ | ||
# Tests aimed at pandas.core.indexers | ||
import numpy as np | ||
|
||
from pandas.core.indexers import length_of_indexer | ||
from pandas.core.indexers import is_scalar_indexer, length_of_indexer | ||
|
||
|
||
def test_length_of_indexer(): | ||
arr = np.zeros(4, dtype=bool) | ||
arr[0] = 1 | ||
result = length_of_indexer(arr) | ||
assert result == 1 | ||
|
||
|
||
def test_is_scalar_indexer(): | ||
indexer = (0, 1) | ||
assert is_scalar_indexer(indexer, 2) | ||
assert not is_scalar_indexer(indexer[0], 2) | ||
|
||
indexer = (np.array([2]), 1) | ||
assert is_scalar_indexer(indexer, 2) | ||
|
||
indexer = (np.array([2]), np.array([3])) | ||
assert is_scalar_indexer(indexer, 2) | ||
|
||
indexer = (np.array([2]), np.array([3, 4])) | ||
assert not is_scalar_indexer(indexer, 2) | ||
|
||
assert not is_scalar_indexer(slice(None), 1) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.