diff options
author | Bas van Beek <b.f.van.beek@vu.nl> | 2022-01-27 13:42:47 +0100 |
---|---|---|
committer | Bas van Beek <b.f.van.beek@vu.nl> | 2022-01-27 14:24:38 +0100 |
commit | 1737a79dfa00894ef3fa48b556540daff05300e8 (patch) | |
tree | 72b8266c61f67b3a3cc6fc07fe86b09f3bc04a0c | |
parent | df80af3da6cb7b71a140528db5a8bb11360e5452 (diff) | |
download | numpy-1737a79dfa00894ef3fa48b556540daff05300e8.tar.gz |
MAINT: Allow `flatiter.__getitem__` to accept 1-tuples
-rw-r--r-- | numpy/__init__.pyi | 5 | ||||
-rw-r--r-- | numpy/typing/tests/data/reveal/flatiter.pyi | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/numpy/__init__.pyi b/numpy/__init__.pyi index 062df938d..f656e8f2f 100644 --- a/numpy/__init__.pyi +++ b/numpy/__init__.pyi @@ -944,11 +944,12 @@ class flatiter(Generic[_NdArraySubClass]): @overload def __getitem__( self: flatiter[ndarray[Any, dtype[_ScalarType]]], - key: int | integer, + key: int | integer | tuple[int | integer], ) -> _ScalarType: ... @overload def __getitem__( - self, key: _ArrayLikeInt | slice | ellipsis + self, + key: _ArrayLikeInt | slice | ellipsis | tuple[_ArrayLikeInt | slice | ellipsis], ) -> _NdArraySubClass: ... @overload def __array__(self: flatiter[ndarray[Any, _DType]], dtype: None = ..., /) -> ndarray[Any, _DType]: ... diff --git a/numpy/typing/tests/data/reveal/flatiter.pyi b/numpy/typing/tests/data/reveal/flatiter.pyi index ef89acb58..61e8a3e91 100644 --- a/numpy/typing/tests/data/reveal/flatiter.pyi +++ b/numpy/typing/tests/data/reveal/flatiter.pyi @@ -13,5 +13,7 @@ reveal_type(a[0]) # E: str_ reveal_type(a[[0, 1, 2]]) # E: ndarray[Any, dtype[str_]] reveal_type(a[...]) # E: ndarray[Any, dtype[str_]] reveal_type(a[:]) # E: ndarray[Any, dtype[str_]] +reveal_type(a[(...,)]) # E: ndarray[Any, dtype[str_]] +reveal_type(a[(0,)]) # E: str_ reveal_type(a.__array__()) # E: ndarray[Any, dtype[str_]] reveal_type(a.__array__(np.dtype(np.float64))) # E: ndarray[Any, dtype[{float64}]] |