diff options
author | czgdp1807 <gdp.1807@gmail.com> | 2021-06-07 15:05:24 +0530 |
---|---|---|
committer | czgdp1807 <gdp.1807@gmail.com> | 2021-06-07 15:05:24 +0530 |
commit | 6f0f6ac879724aaa105dcf29def1e88e66420f5c (patch) | |
tree | 6cef9901c1c7f2365bcf10cf1fb2a061a0ee5d72 /numpy/typing/_shape.py | |
parent | 4e59da126b522dd5a894041a4c9570e130fe7ae4 (diff) | |
parent | 21838b4b21d8c702730aba80131fe6ee5fe5116f (diff) | |
download | numpy-6f0f6ac879724aaa105dcf29def1e88e66420f5c.tar.gz |
resolved conflicts
Diffstat (limited to 'numpy/typing/_shape.py')
-rw-r--r-- | numpy/typing/_shape.py | 4 |
1 files changed, 2 insertions, 2 deletions
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, ...] |