Merge branch 'main' into matrix_rank-doc-fix

1 files changed, 12 insertions, 2 deletions

diff --git a/numpy/typing/_shape.py b/numpy/typing/_shape.py
index 4629046ea..75698f3d3 100644
--- a/numpy/typing/_shape.py
+++ b/numpy/typing/_shape.py
@@ -1,6 +1,16 @@
-from typing import Sequence, Tuple, Union
+import sys
+from typing import Sequence, Tuple, Union, Any
+
+from . import _HAS_TYPING_EXTENSIONS
+
+if sys.version_info >= (3, 8):
+    from typing import SupportsIndex
+elif _HAS_TYPING_EXTENSIONS:
+    from typing_extensions import SupportsIndex
+else:
+    SupportsIndex = Any
 
 _Shape = Tuple[int, ...]
 
 # Anything that can be coerced to a shape tuple
-_ShapeLike = Union[int, Sequence[int]]
+_ShapeLike = Union[SupportsIndex, Sequence[SupportsIndex]]