diff options
author | Matti Picus <matti.picus@gmail.com> | 2022-10-02 12:21:49 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-02 12:21:49 +0300 |
commit | 3bfe84acbe5e9fcc87c92365be647c20d6695edd (patch) | |
tree | c15537389ba3ebef970184dbafa68bc862f3b489 /numpy | |
parent | df6c2af5a168a57e3246b233560c27d132931a10 (diff) | |
parent | 97465164fe448e394a3cea2ef23ed7ebf9cecb3c (diff) | |
download | numpy-3bfe84acbe5e9fcc87c92365be647c20d6695edd.tar.gz |
Merge pull request #22358 from BvB93/index
ENH,TYP: Add special casing for `ndarray`-based indexing
Diffstat (limited to 'numpy')
-rw-r--r-- | numpy/__init__.pyi | 6 | ||||
-rw-r--r-- | numpy/typing/tests/data/reveal/ndarray_misc.pyi | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/numpy/__init__.pyi b/numpy/__init__.pyi index 992ed908a..623334291 100644 --- a/numpy/__init__.pyi +++ b/numpy/__init__.pyi @@ -1549,6 +1549,12 @@ class ndarray(_ArrayOrScalarCommon, Generic[_ShapeType, _DType_co]): ) -> ndarray[_ShapeType2, _DType]: ... @overload + def __getitem__(self, key: ( + NDArray[integer[Any]] + | NDArray[bool_] + | tuple[NDArray[integer[Any]] | NDArray[bool_], ...] + )) -> ndarray[Any, _DType_co]: ... + @overload def __getitem__(self, key: SupportsIndex | tuple[SupportsIndex, ...]) -> Any: ... @overload def __getitem__(self, key: ( diff --git a/numpy/typing/tests/data/reveal/ndarray_misc.pyi b/numpy/typing/tests/data/reveal/ndarray_misc.pyi index 779d0909b..03fea72dc 100644 --- a/numpy/typing/tests/data/reveal/ndarray_misc.pyi +++ b/numpy/typing/tests/data/reveal/ndarray_misc.pyi @@ -200,8 +200,8 @@ reveal_type(AR_f8.__array_wrap__(B)) # E: ndarray[Any, dtype[object_]] reveal_type(AR_V[0]) # E: Any reveal_type(AR_V[0, 0]) # E: Any -reveal_type(AR_V[AR_i8]) # E: Any -reveal_type(AR_V[AR_i8, AR_i8]) # E: Any +reveal_type(AR_V[AR_i8]) # E: ndarray[Any, dtype[void]] +reveal_type(AR_V[AR_i8, AR_i8]) # E: ndarray[Any, dtype[void]] reveal_type(AR_V[AR_i8, None]) # E: ndarray[Any, dtype[void]] reveal_type(AR_V[0, ...]) # E: ndarray[Any, dtype[void]] reveal_type(AR_V[[0]]) # E: ndarray[Any, dtype[void]] |