summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBas van Beek <b.f.van.beek@vu.nl>2020-10-21 16:03:23 +0200
committerBas van Beek <b.f.van.beek@vu.nl>2020-10-21 16:03:23 +0200
commit6161fd97eed9c6244a7adf343b8df2291df56a76 (patch)
treeb5ea52cec0cd570d6aa13d741b6c71ba6d2e4286
parent9bbb13b81d842dafe8ea4e03dff9b9b6c021fd71 (diff)
downloadnumpy-6161fd97eed9c6244a7adf343b8df2291df56a76.tar.gz
TST: Fixed a broken `np.core.numeric` test
-rw-r--r--numpy/core/numeric.pyi4
-rw-r--r--numpy/typing/tests/data/reveal/numeric.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/numpy/core/numeric.pyi b/numpy/core/numeric.pyi
index f917f74de..de80cfe08 100644
--- a/numpy/core/numeric.pyi
+++ b/numpy/core/numeric.pyi
@@ -12,7 +12,7 @@ from typing import (
Iterable,
)
-from numpy import ndarray, generic, dtype, bool_, int32, int64, _OrderKACF, _OrderCF
+from numpy import ndarray, generic, dtype, bool_, signedinteger, _OrderKACF, _OrderCF
from numpy.typing import ArrayLike, DtypeLike, _ShapeLike
if sys.version_info >= (3, 8):
@@ -113,7 +113,7 @@ def count_nonzero(
@overload
def count_nonzero(
a: ArrayLike, axis: _ShapeLike = ..., *, keepdims: bool = ...
-) -> Union[int64, int32, ndarray]: ...
+) -> Union[signedinteger[Any], ndarray]: ... # TODO: np.intp
def isfortran(a: Union[ndarray, generic]) -> bool: ...
def argwhere(a: ArrayLike) -> ndarray: ...
def flatnonzero(a: ArrayLike) -> ndarray: ...
diff --git a/numpy/typing/tests/data/reveal/numeric.py b/numpy/typing/tests/data/reveal/numeric.py
index 6bd4ed9fd..5cbfa4ac7 100644
--- a/numpy/typing/tests/data/reveal/numeric.py
+++ b/numpy/typing/tests/data/reveal/numeric.py
@@ -20,8 +20,8 @@ C: SubClass
reveal_type(np.count_nonzero(i8)) # E: int
reveal_type(np.count_nonzero(A)) # E: int
reveal_type(np.count_nonzero(B)) # E: int
-reveal_type(np.count_nonzero(A, keepdims=True)) # E: Union[numpy.int64, numpy.int32, numpy.ndarray]
-reveal_type(np.count_nonzero(A, axis=0)) # E: Union[numpy.int64, numpy.int32, numpy.ndarray]
+reveal_type(np.count_nonzero(A, keepdims=True)) # E: Union[numpy.signedinteger[Any], numpy.ndarray]
+reveal_type(np.count_nonzero(A, axis=0)) # E: Union[numpy.signedinteger[Any], numpy.ndarray]
reveal_type(np.isfortran(i8)) # E: bool
reveal_type(np.isfortran(A)) # E: bool