Skip to content

CLN: share setitem/getitem validators #36619

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

Merged
merged 1 commit into from
Sep 26, 2020
Merged

CLN: share setitem/getitem validators #36619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions pandas/core/arrays/_mixins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from pandas.core.algorithms import take, unique
from pandas.core.array_algos.transforms import shift
from pandas.core.arrays.base import ExtensionArray
from pandas.core.construction import extract_array
from pandas.core.indexers import check_array_indexer

_T = TypeVar("_T", bound="NDArrayBackedExtensionArray")
Expand Down Expand Up @@ -197,6 +198,7 @@ def __getitem__(self, key):
return result

def _validate_getitem_key(self, key):
key = extract_array(key, extract_numpy=True)
return check_array_indexer(self, key)

@doc(ExtensionArray.fillna)
Expand Down
5 changes: 2 additions & 3 deletions pandas/core/arrays/categorical.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
from pandas.core.base import ExtensionArray, NoNewAttributesMixin, PandasObject
import pandas.core.common as com
from pandas.core.construction import array, extract_array, sanitize_array
from pandas.core.indexers import check_array_indexer, deprecate_ndim_indexing
from pandas.core.indexers import deprecate_ndim_indexing
from pandas.core.missing import interpolate_2d
from pandas.core.ops.common import unpack_zerodim_and_defer
from pandas.core.sorting import nargsort
Expand Down Expand Up @@ -1923,8 +1923,7 @@ def _validate_setitem_key(self, key):

# else: array of True/False in Series or Categorical

key = check_array_indexer(self, key)
return key
return super()._validate_setitem_key(key)

def _reverse_indexer(self) -> Dict[Hashable, np.ndarray]:
"""
Expand Down
14 changes: 0 additions & 14 deletions pandas/core/arrays/numpy_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
from pandas.core.array_algos import masked_reductions
from pandas.core.arrays._mixins import NDArrayBackedExtensionArray
from pandas.core.arrays.base import ExtensionOpsMixin
from pandas.core.construction import extract_array


class PandasDtype(ExtensionDtype):
Expand Down Expand Up @@ -244,19 +243,6 @@ def __array_ufunc__(self, ufunc, method: str, *inputs, **kwargs):
# ------------------------------------------------------------------------
# Pandas ExtensionArray Interface

def _validate_getitem_key(self, key):
if isinstance(key, type(self)):
key = key._ndarray

return super()._validate_getitem_key(key)

def _validate_setitem_value(self, value):
value = extract_array(value, extract_numpy=True)

if not lib.is_scalar(value):
value = np.asarray(value, dtype=self._ndarray.dtype)
return value

def isna(self) -> np.ndarray:
return isna(self._ndarray)

Expand Down