diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2022-04-15 12:14:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-15 12:14:20 -0600 |
| commit | e44181c180807387f0557be5aba916506f53f0f2 (patch) | |
| tree | 9794638fb71eb6863f572a810e0bd4d97f69da44 | |
| parent | ae13307732b430daa56c6a85ab56006611a5b6ba (diff) | |
| parent | e3ac61a1d2360ccf111023c265068e8048fef2e7 (diff) | |
| download | numpy-e44181c180807387f0557be5aba916506f53f0f2.tar.gz | |
Merge pull request #21345 from BvB93/indexing
TYP: Let `ndarray` fancy indexing always return an `ndarray`
| -rw-r--r-- | numpy/__init__.pyi | 6 | ||||
| -rw-r--r-- | numpy/typing/tests/data/reveal/ndarray_misc.pyi | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/numpy/__init__.pyi b/numpy/__init__.pyi index 32db929da..f22692c02 100644 --- a/numpy/__init__.pyi +++ b/numpy/__init__.pyi @@ -1546,11 +1546,7 @@ class ndarray(_ArrayOrScalarCommon, Generic[_ShapeType, _DType_co]): ) -> ndarray[_ShapeType2, _DType]: ... @overload - def __getitem__(self, key: ( - SupportsIndex - | _ArrayLikeInt_co - | tuple[SupportsIndex | _ArrayLikeInt_co, ...] - )) -> Any: ... + def __getitem__(self, key: SupportsIndex | tuple[SupportsIndex, ...]) -> Any: ... @overload def __getitem__(self, key: ( None diff --git a/numpy/typing/tests/data/reveal/ndarray_misc.pyi b/numpy/typing/tests/data/reveal/ndarray_misc.pyi index fb2989a45..779d0909b 100644 --- a/numpy/typing/tests/data/reveal/ndarray_misc.pyi +++ b/numpy/typing/tests/data/reveal/ndarray_misc.pyi @@ -204,6 +204,8 @@ reveal_type(AR_V[AR_i8]) # E: Any reveal_type(AR_V[AR_i8, AR_i8]) # E: Any 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]] +reveal_type(AR_V[[0], [0]]) # E: ndarray[Any, dtype[void]] reveal_type(AR_V[:]) # E: ndarray[Any, dtype[void]] reveal_type(AR_V["a"]) # E: ndarray[Any, dtype[Any]] reveal_type(AR_V[["a", "b"]]) # E: ndarray[Any, dtype[void]] |