summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBas van Beek <43369155+BvB93@users.noreply.github.com>2021-06-05 23:35:11 +0200
committerBas van Beek <43369155+BvB93@users.noreply.github.com>2021-06-05 23:35:11 +0200
commit7162dc3c9f3cc02434c50dfb4e55b790453c00a4 (patch)
treea1e42466dc626dc78986bec79bb8c0c9ff50bbe8
parentf23ade75773f5e94c030c40cae5b6e081b650205 (diff)
downloadnumpy-7162dc3c9f3cc02434c50dfb4e55b790453c00a4.tar.gz
REV,BUG: Replace `NotImplemented` with `typing.Any`
-rw-r--r--numpy/typing/__init__.py14
-rw-r--r--numpy/typing/_array_like.py4
-rw-r--r--numpy/typing/_callable.py44
-rw-r--r--numpy/typing/_char_codes.py98
-rw-r--r--numpy/typing/_dtype_like.py2
-rw-r--r--numpy/typing/_extended_precision.py24
-rw-r--r--numpy/typing/_shape.py4
-rw-r--r--numpy/typing/tests/test_generic_alias.py4
8 files changed, 97 insertions, 97 deletions
diff --git a/numpy/typing/__init__.py b/numpy/typing/__init__.py
index 252123a19..19424169a 100644
--- a/numpy/typing/__init__.py
+++ b/numpy/typing/__init__.py
@@ -164,7 +164,7 @@ API
# NOTE: The API section will be appended with additional entries
# further down in this file
-from typing import TYPE_CHECKING, List
+from typing import TYPE_CHECKING, List, Any
if TYPE_CHECKING:
# typing_extensions is always available when type-checking
@@ -376,14 +376,14 @@ if TYPE_CHECKING:
_GUFunc_Nin2_Nout1,
)
else:
- _UFunc_Nin1_Nout1 = NotImplemented
- _UFunc_Nin2_Nout1 = NotImplemented
- _UFunc_Nin1_Nout2 = NotImplemented
- _UFunc_Nin2_Nout2 = NotImplemented
- _GUFunc_Nin2_Nout1 = NotImplemented
+ _UFunc_Nin1_Nout1 = Any
+ _UFunc_Nin2_Nout1 = Any
+ _UFunc_Nin1_Nout2 = Any
+ _UFunc_Nin2_Nout2 = Any
+ _GUFunc_Nin2_Nout1 = Any
# Clean up the namespace
-del TYPE_CHECKING, final, List
+del TYPE_CHECKING, final, List, Any
if __doc__ is not None:
from ._add_docstring import _docstrings
diff --git a/numpy/typing/_array_like.py b/numpy/typing/_array_like.py
index 2b823ecc0..187dfb96a 100644
--- a/numpy/typing/_array_like.py
+++ b/numpy/typing/_array_like.py
@@ -1,7 +1,7 @@
from __future__ import annotations
import sys
-from typing import Any, Sequence, TYPE_CHECKING, Union, TypeVar
+from typing import Any, Sequence, TYPE_CHECKING, Union, TypeVar, Generic
from numpy import (
ndarray,
@@ -43,7 +43,7 @@ if TYPE_CHECKING or _HAS_TYPING_EXTENSIONS:
class _SupportsArray(Protocol[_DType_co]):
def __array__(self) -> ndarray[Any, _DType_co]: ...
else:
- _SupportsArray = Any
+ class _SupportsArray(Generic[_DType_co]): ...
# TODO: Wait for support for recursive types
_NestedSequence = Union[
diff --git a/numpy/typing/_callable.py b/numpy/typing/_callable.py
index 54f9b1425..52573f648 100644
--- a/numpy/typing/_callable.py
+++ b/numpy/typing/_callable.py
@@ -332,25 +332,25 @@ if TYPE_CHECKING or _HAS_TYPING_EXTENSIONS:
def __call__(self, __other: _T2) -> NDArray[bool_]: ...
else:
- _BoolOp = NotImplemented
- _BoolBitOp = NotImplemented
- _BoolSub = NotImplemented
- _BoolTrueDiv = NotImplemented
- _BoolMod = NotImplemented
- _BoolDivMod = NotImplemented
- _TD64Div = NotImplemented
- _IntTrueDiv = NotImplemented
- _UnsignedIntOp = NotImplemented
- _UnsignedIntBitOp = NotImplemented
- _UnsignedIntMod = NotImplemented
- _UnsignedIntDivMod = NotImplemented
- _SignedIntOp = NotImplemented
- _SignedIntBitOp = NotImplemented
- _SignedIntMod = NotImplemented
- _SignedIntDivMod = NotImplemented
- _FloatOp = NotImplemented
- _FloatMod = NotImplemented
- _FloatDivMod = NotImplemented
- _ComplexOp = NotImplemented
- _NumberOp = NotImplemented
- _ComparisonOp = NotImplemented
+ _BoolOp = Any
+ _BoolBitOp = Any
+ _BoolSub = Any
+ _BoolTrueDiv = Any
+ _BoolMod = Any
+ _BoolDivMod = Any
+ _TD64Div = Any
+ _IntTrueDiv = Any
+ _UnsignedIntOp = Any
+ _UnsignedIntBitOp = Any
+ _UnsignedIntMod = Any
+ _UnsignedIntDivMod = Any
+ _SignedIntOp = Any
+ _SignedIntBitOp = Any
+ _SignedIntMod = Any
+ _SignedIntDivMod = Any
+ _FloatOp = Any
+ _FloatMod = Any
+ _FloatDivMod = Any
+ _ComplexOp = Any
+ _NumberOp = Any
+ _ComparisonOp = Any
diff --git a/numpy/typing/_char_codes.py b/numpy/typing/_char_codes.py
index 6b33f995d..24d39c62e 100644
--- a/numpy/typing/_char_codes.py
+++ b/numpy/typing/_char_codes.py
@@ -120,52 +120,52 @@ if TYPE_CHECKING or _HAS_TYPING_EXTENSIONS:
]
else:
- _BoolCodes = NotImplemented
-
- _UInt8Codes = NotImplemented
- _UInt16Codes = NotImplemented
- _UInt32Codes = NotImplemented
- _UInt64Codes = NotImplemented
-
- _Int8Codes = NotImplemented
- _Int16Codes = NotImplemented
- _Int32Codes = NotImplemented
- _Int64Codes = NotImplemented
-
- _Float16Codes = NotImplemented
- _Float32Codes = NotImplemented
- _Float64Codes = NotImplemented
-
- _Complex64Codes = NotImplemented
- _Complex128Codes = NotImplemented
-
- _ByteCodes = NotImplemented
- _ShortCodes = NotImplemented
- _IntCCodes = NotImplemented
- _IntPCodes = NotImplemented
- _IntCodes = NotImplemented
- _LongLongCodes = NotImplemented
-
- _UByteCodes = NotImplemented
- _UShortCodes = NotImplemented
- _UIntCCodes = NotImplemented
- _UIntPCodes = NotImplemented
- _UIntCodes = NotImplemented
- _ULongLongCodes = NotImplemented
-
- _HalfCodes = NotImplemented
- _SingleCodes = NotImplemented
- _DoubleCodes = NotImplemented
- _LongDoubleCodes = NotImplemented
-
- _CSingleCodes = NotImplemented
- _CDoubleCodes = NotImplemented
- _CLongDoubleCodes = NotImplemented
-
- _StrCodes = NotImplemented
- _BytesCodes = NotImplemented
- _VoidCodes = NotImplemented
- _ObjectCodes = NotImplemented
-
- _DT64Codes = NotImplemented
- _TD64Codes = NotImplemented
+ _BoolCodes = Any
+
+ _UInt8Codes = Any
+ _UInt16Codes = Any
+ _UInt32Codes = Any
+ _UInt64Codes = Any
+
+ _Int8Codes = Any
+ _Int16Codes = Any
+ _Int32Codes = Any
+ _Int64Codes = Any
+
+ _Float16Codes = Any
+ _Float32Codes = Any
+ _Float64Codes = Any
+
+ _Complex64Codes = Any
+ _Complex128Codes = Any
+
+ _ByteCodes = Any
+ _ShortCodes = Any
+ _IntCCodes = Any
+ _IntPCodes = Any
+ _IntCodes = Any
+ _LongLongCodes = Any
+
+ _UByteCodes = Any
+ _UShortCodes = Any
+ _UIntCCodes = Any
+ _UIntPCodes = Any
+ _UIntCodes = Any
+ _ULongLongCodes = Any
+
+ _HalfCodes = Any
+ _SingleCodes = Any
+ _DoubleCodes = Any
+ _LongDoubleCodes = Any
+
+ _CSingleCodes = Any
+ _CDoubleCodes = Any
+ _CLongDoubleCodes = Any
+
+ _StrCodes = Any
+ _BytesCodes = Any
+ _VoidCodes = Any
+ _ObjectCodes = Any
+
+ _DT64Codes = Any
+ _TD64Codes = Any
diff --git a/numpy/typing/_dtype_like.py b/numpy/typing/_dtype_like.py
index 405cc4a3c..061b4c0ed 100644
--- a/numpy/typing/_dtype_like.py
+++ b/numpy/typing/_dtype_like.py
@@ -81,7 +81,7 @@ if TYPE_CHECKING or _HAS_TYPING_EXTENSIONS:
def dtype(self) -> _DType_co: ...
else:
- _DTypeDict = NotImplemented
+ _DTypeDict = Any
class _SupportsDType: ...
_SupportsDType = GenericAlias(_SupportsDType, _DType_co)
diff --git a/numpy/typing/_extended_precision.py b/numpy/typing/_extended_precision.py
index 3f1ce2038..0900bc659 100644
--- a/numpy/typing/_extended_precision.py
+++ b/numpy/typing/_extended_precision.py
@@ -28,15 +28,15 @@ if TYPE_CHECKING:
complex256 = np.complexfloating[_128Bit, _128Bit]
complex512 = np.complexfloating[_256Bit, _256Bit]
else:
- uint128 = NotImplemented
- uint256 = NotImplemented
- int128 = NotImplemented
- int256 = NotImplemented
- float80 = NotImplemented
- float96 = NotImplemented
- float128 = NotImplemented
- float256 = NotImplemented
- complex160 = NotImplemented
- complex192 = NotImplemented
- complex256 = NotImplemented
- complex512 = NotImplemented
+ uint128 = Any
+ uint256 = Any
+ int128 = Any
+ int256 = Any
+ float80 = Any
+ float96 = Any
+ float128 = Any
+ float256 = Any
+ complex160 = Any
+ complex192 = Any
+ complex256 = Any
+ complex512 = Any
diff --git a/numpy/typing/_shape.py b/numpy/typing/_shape.py
index 0742be8a9..75698f3d3 100644
--- a/numpy/typing/_shape.py
+++ b/numpy/typing/_shape.py
@@ -1,5 +1,5 @@
import sys
-from typing import Sequence, Tuple, Union
+from typing import Sequence, Tuple, Union, Any
from . import _HAS_TYPING_EXTENSIONS
@@ -8,7 +8,7 @@ if sys.version_info >= (3, 8):
elif _HAS_TYPING_EXTENSIONS:
from typing_extensions import SupportsIndex
else:
- SupportsIndex = NotImplemented
+ SupportsIndex = Any
_Shape = Tuple[int, ...]
diff --git a/numpy/typing/tests/test_generic_alias.py b/numpy/typing/tests/test_generic_alias.py
index 27afe3927..538d7eae5 100644
--- a/numpy/typing/tests/test_generic_alias.py
+++ b/numpy/typing/tests/test_generic_alias.py
@@ -21,8 +21,8 @@ if sys.version_info >= (3, 9):
NDArray_ref = types.GenericAlias(np.ndarray, (Any, DType_ref))
FuncType = Callable[[Union[_GenericAlias, types.GenericAlias]], Any]
else:
- DType_ref = NotImplemented
- NDArray_ref = NotImplemented
+ DType_ref = Any
+ NDArray_ref = Any
FuncType = Callable[[_GenericAlias], Any]
GETATTR_NAMES = sorted(set(dir(np.ndarray)) - _GenericAlias._ATTR_EXCEPTIONS)