summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBas van Beek <b.f.van.beek@vu.nl>2022-03-11 18:26:37 +0100
committerBas van Beek <b.f.van.beek@vu.nl>2022-03-11 18:29:08 +0100
commit60a21d00eca5c4326940f3e7d1e23eccfbcde818 (patch)
tree4e5ee80af1f0e534085f202ef399b9812dab667f
parent23a904fee7d9f81f2150a697a01da5b57fc10a10 (diff)
downloadnumpy-60a21d00eca5c4326940f3e7d1e23eccfbcde818.tar.gz
TST: Adapt to the mypy 0.940 `iter` changes
xref https://github.com/python/typeshed/pull/6035
-rw-r--r--numpy/typing/tests/data/reveal/flatiter.pyi2
-rw-r--r--numpy/typing/tests/data/reveal/index_tricks.pyi8
-rw-r--r--numpy/typing/tests/data/reveal/nditer.pyi2
3 files changed, 6 insertions, 6 deletions
diff --git a/numpy/typing/tests/data/reveal/flatiter.pyi b/numpy/typing/tests/data/reveal/flatiter.pyi
index f0c3d1454..0f0758175 100644
--- a/numpy/typing/tests/data/reveal/flatiter.pyi
+++ b/numpy/typing/tests/data/reveal/flatiter.pyi
@@ -7,7 +7,7 @@ reveal_type(a.base) # E: ndarray[Any, dtype[str_]]
reveal_type(a.copy()) # E: ndarray[Any, dtype[str_]]
reveal_type(a.coords) # E: tuple[builtins.int, ...]
reveal_type(a.index) # E: int
-reveal_type(iter(a)) # E: Iterator[str_]
+reveal_type(iter(a)) # E: flatiter[ndarray[Any, dtype[str_]]]
reveal_type(next(a)) # E: str_
reveal_type(a[0]) # E: str_
reveal_type(a[[0, 1, 2]]) # E: ndarray[Any, dtype[str_]]
diff --git a/numpy/typing/tests/data/reveal/index_tricks.pyi b/numpy/typing/tests/data/reveal/index_tricks.pyi
index d52128814..707d6f3d4 100644
--- a/numpy/typing/tests/data/reveal/index_tricks.pyi
+++ b/numpy/typing/tests/data/reveal/index_tricks.pyi
@@ -20,13 +20,13 @@ reveal_type(next(np.ndenumerate(AR_i8))) # E: Tuple[builtins.tuple[builtins.int
reveal_type(next(np.ndenumerate(AR_LIKE_f))) # E: Tuple[builtins.tuple[builtins.int, ...], {double}]
reveal_type(next(np.ndenumerate(AR_LIKE_U))) # E: Tuple[builtins.tuple[builtins.int, ...], str_]
-reveal_type(iter(np.ndenumerate(AR_i8))) # E: Iterator[Tuple[builtins.tuple[builtins.int], {int64}]]
-reveal_type(iter(np.ndenumerate(AR_LIKE_f))) # E: Iterator[Tuple[builtins.tuple[builtins.int], {double}]]
-reveal_type(iter(np.ndenumerate(AR_LIKE_U))) # E: Iterator[Tuple[builtins.tuple[builtins.int], str_]]
+reveal_type(iter(np.ndenumerate(AR_i8))) # E: ndenumerate[{int64}]
+reveal_type(iter(np.ndenumerate(AR_LIKE_f))) # E: ndenumerate[{double}]
+reveal_type(iter(np.ndenumerate(AR_LIKE_U))) # E: ndenumerate[str_]
reveal_type(np.ndindex(1, 2, 3)) # E: numpy.ndindex
reveal_type(np.ndindex((1, 2, 3))) # E: numpy.ndindex
-reveal_type(iter(np.ndindex(1, 2, 3))) # E: Iterator[builtins.tuple[builtins.int, ...]]
+reveal_type(iter(np.ndindex(1, 2, 3))) # E: ndindex
reveal_type(next(np.ndindex(1, 2, 3))) # E: builtins.tuple[builtins.int, ...]
reveal_type(np.unravel_index([22, 41, 37], (7, 6))) # E: tuple[ndarray[Any, dtype[{intp}]], ...]
diff --git a/numpy/typing/tests/data/reveal/nditer.pyi b/numpy/typing/tests/data/reveal/nditer.pyi
index cecf2740c..fd8b7e109 100644
--- a/numpy/typing/tests/data/reveal/nditer.pyi
+++ b/numpy/typing/tests/data/reveal/nditer.pyi
@@ -35,7 +35,7 @@ reveal_type(nditer_obj.remove_multi_index()) # E: None
reveal_type(nditer_obj.reset()) # E: None
reveal_type(len(nditer_obj)) # E: int
-reveal_type(iter(nditer_obj)) # E: Iterator[builtins.tuple[ndarray[Any, dtype[Any]]], ...]
+reveal_type(iter(nditer_obj)) # E: nditer
reveal_type(next(nditer_obj)) # E: tuple[ndarray[Any, dtype[Any]], ...]
reveal_type(nditer_obj.__copy__()) # E: nditer
with nditer_obj as f: