replace alias with plain slice[SupportsIndex | none]

Author: randolf-scholz

stdlib/_ctypes.pyi

@@ -5,7 +5,7 @@ from abc import abstractmethod
 from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence
 from ctypes import CDLL, ArgumentError as ArgumentError, c_void_p
 from types import GenericAlias
-from typing import Any, ClassVar, Generic, TypeVar, final, overload, type_check_only
+from typing import Any, ClassVar, Generic, SupportsIndex, TypeVar, final, overload, type_check_only
 from typing_extensions import Self, TypeAlias
 
 _T = TypeVar("_T")
@@ -130,7 +130,7 @@ class _Pointer(_PointerLike, _CData, Generic[_CT], metaclass=_PyCPointerType):
     @overload
     def __getitem__(self, key: int, /) -> Any: ...
     @overload
-    def __getitem__(self, key: IndexSlice, /) -> list[Any]: ...
+    def __getitem__(self, key: slice[SupportsIndex | None], /) -> list[Any]: ...
     def __setitem__(self, key: int, value: Any, /) -> None: ...
 
 if sys.version_info < (3, 14):
@@ -313,11 +313,11 @@ class Array(_CData, Generic[_CT], metaclass=_PyCArrayType):
     @overload
     def __getitem__(self, key: int, /) -> Any: ...
     @overload
-    def __getitem__(self, key: IndexSlice, /) -> list[Any]: ...
+    def __getitem__(self, key: slice[SupportsIndex | None], /) -> list[Any]: ...
     @overload
     def __setitem__(self, key: int, value: Any, /) -> None: ...
     @overload
-    def __setitem__(self, key: IndexSlice, value: Iterable[Any], /) -> None: ...
+    def __setitem__(self, key: slice[SupportsIndex | None], value: Iterable[Any], /) -> None: ...
     def __iter__(self) -> Iterator[Any]: ...
     # Can't inherit from Sized because the metaclass conflict between
     # Sized and _CData prevents using _CDataMeta.

stdlib/_operator.pyi

@@ -1,5 +1,5 @@
 import sys
-from _typeshed import IndexSlice, SupportsGetItem
+from _typeshed import SupportsGetItem
 from collections.abc import Callable, Container, Iterable, MutableMapping, MutableSequence, Sequence
 from operator import attrgetter as attrgetter, itemgetter as itemgetter, methodcaller as methodcaller
 from typing import Any, AnyStr, Protocol, SupportsAbs, SupportsIndex, TypeVar, overload
@@ -75,18 +75,18 @@ def countOf(a: Iterable[object], b: object, /) -> int: ...
 @overload
 def delitem(a: MutableSequence[Any], b: SupportsIndex, /) -> None: ...
 @overload
-def delitem(a: MutableSequence[Any], b: IndexSlice, /) -> None: ...
+def delitem(a: MutableSequence[Any], b: slice[SupportsIndex | None], /) -> None: ...
 @overload
 def delitem(a: MutableMapping[_K, Any], b: _K, /) -> None: ...
 @overload
-def getitem(a: Sequence[_T], b: IndexSlice, /) -> Sequence[_T]: ...
+def getitem(a: Sequence[_T], b: slice[SupportsIndex | None], /) -> Sequence[_T]: ...
 @overload
 def getitem(a: SupportsGetItem[_K, _V], b: _K, /) -> _V: ...
 def indexOf(a: Iterable[_T], b: _T, /) -> int: ...
 @overload
 def setitem(a: MutableSequence[_T], b: SupportsIndex, c: _T, /) -> None: ...
 @overload
-def setitem(a: MutableSequence[_T], b: IndexSlice, c: Sequence[_T], /) -> None: ...
+def setitem(a: MutableSequence[_T], b: slice[SupportsIndex | None], c: Sequence[_T], /) -> None: ...
 @overload
 def setitem(a: MutableMapping[_K, _V], b: _K, c: _V, /) -> None: ...
 def length_hint(obj: object, default: int = 0, /) -> int: ...

stdlib/_typeshed/__init__.pyi

@@ -70,9 +70,6 @@ MaybeNone: TypeAlias = Any  # stable
 # def foo(x: int | None | _SentinelType = ...) -> None: ...
 sentinel: Any
 
-IndexSlice: TypeAlias = slice[SupportsIndex | None, SupportsIndex | None, SupportsIndex | None]
-IntSlice: TypeAlias = slice[int | None, int | None, int | None]
-
 # stable
 class IdentityFunction(Protocol):
     def __call__(self, x: _T, /) -> _T: ...
@@ -287,15 +284,15 @@ WriteableBuffer: TypeAlias = Buffer
 ReadableBuffer: TypeAlias = Buffer  # stable
 
 class SliceableBuffer(Buffer, Protocol):
-    def __getitem__(self, slice: IndexSlice, /) -> Sequence[int]: ...
+    def __getitem__(self, slice: slice[SupportsIndex | None], /) -> Sequence[int]: ...
 
 class IndexableBuffer(Buffer, Protocol):
     def __getitem__(self, i: int, /) -> int: ...
 
 class SupportsGetItemBuffer(SliceableBuffer, IndexableBuffer, Protocol):
     def __contains__(self, x: Any, /) -> bool: ...
     @overload
-    def __getitem__(self, slice: IndexSlice, /) -> Sequence[int]: ...
+    def __getitem__(self, slice: slice[SupportsIndex | None], /) -> Sequence[int]: ...
     @overload
     def __getitem__(self, i: int, /) -> int: ...
 

stdlib/array.pyi

@@ -62,12 +62,12 @@ class array(MutableSequence[_T]):
     @overload
     def __getitem__(self, key: SupportsIndex, /) -> _T: ...
     @overload
-    def __getitem__(self, key: IndexSlice, /) -> array[_T]: ...
+    def __getitem__(self, key: slice[SupportsIndex | None], /) -> array[_T]: ...
     @overload  # type: ignore[override]
     def __setitem__(self, key: SupportsIndex, value: _T, /) -> None: ...
     @overload
-    def __setitem__(self, key: IndexSlice, value: array[_T], /) -> None: ...
-    def __delitem__(self, key: SupportsIndex | IndexSlice, /) -> None: ...
+    def __setitem__(self, key: slice[SupportsIndex | None], value: array[_T], /) -> None: ...
+    def __delitem__(self, key: SupportsIndex | slice[SupportsIndex | None], /) -> None: ...
     def __add__(self, value: array[_T], /) -> array[_T]: ...
     def __eq__(self, value: object, /) -> bool: ...
     def __ge__(self, value: array[_T], /) -> bool: ...

stdlib/builtins.pyi

@@ -614,9 +614,9 @@ class str(Sequence[str]):
     def __eq__(self, value: object, /) -> bool: ...
     def __ge__(self, value: str, /) -> bool: ...
     @overload
-    def __getitem__(self: LiteralString, key: SupportsIndex | IndexSlice, /) -> LiteralString: ...
+    def __getitem__(self: LiteralString, key: SupportsIndex | slice[SupportsIndex | None], /) -> LiteralString: ...
     @overload
-    def __getitem__(self, key: SupportsIndex | IndexSlice, /) -> str: ...  # type: ignore[misc]
+    def __getitem__(self, key: SupportsIndex | slice[SupportsIndex | None], /) -> str: ...  # type: ignore[misc]
     def __gt__(self, value: str, /) -> bool: ...
     def __hash__(self) -> int: ...
     @overload
@@ -720,7 +720,7 @@ class bytes(Sequence[int]):
     @overload
     def __getitem__(self, key: SupportsIndex, /) -> int: ...
     @overload
-    def __getitem__(self, key: IndexSlice, /) -> bytes: ...
+    def __getitem__(self, key: slice[SupportsIndex | None], /) -> bytes: ...
     def __add__(self, value: ReadableBuffer, /) -> bytes: ...
     def __mul__(self, value: SupportsIndex, /) -> bytes: ...
     def __rmul__(self, value: SupportsIndex, /) -> bytes: ...
@@ -824,12 +824,12 @@ class bytearray(MutableSequence[int]):
     @overload
     def __getitem__(self, key: SupportsIndex, /) -> int: ...
     @overload
-    def __getitem__(self, key: IndexSlice, /) -> bytearray: ...
+    def __getitem__(self, key: slice[SupportsIndex | None], /) -> bytearray: ...
     @overload
     def __setitem__(self, key: SupportsIndex, value: SupportsIndex, /) -> None: ...
     @overload
-    def __setitem__(self, key: IndexSlice, value: Iterable[SupportsIndex] | bytes, /) -> None: ...
-    def __delitem__(self, key: SupportsIndex | IndexSlice, /) -> None: ...
+    def __setitem__(self, key: slice[SupportsIndex | None], value: Iterable[SupportsIndex] | bytes, /) -> None: ...
+    def __delitem__(self, key: SupportsIndex | slice[SupportsIndex | None], /) -> None: ...
     def __add__(self, value: ReadableBuffer, /) -> bytearray: ...
     # The superclass wants us to accept Iterable[int], but that fails at runtime.
     def __iadd__(self, value: ReadableBuffer, /) -> Self: ...  # type: ignore[override]
@@ -901,14 +901,14 @@ class memoryview(Sequence[_I]):
     @overload
     def __getitem__(self, key: SupportsIndex | tuple[SupportsIndex, ...], /) -> _I: ...
     @overload
-    def __getitem__(self, key: IndexSlice, /) -> memoryview[_I]: ...
+    def __getitem__(self, key: slice[SupportsIndex | None], /) -> memoryview[_I]: ...
     def __contains__(self, x: object, /) -> bool: ...
     def __iter__(self) -> Iterator[_I]: ...
     def __len__(self) -> int: ...
     def __eq__(self, value: object, /) -> bool: ...
     def __hash__(self) -> int: ...
     @overload
-    def __setitem__(self, key: IndexSlice, value: ReadableBuffer, /) -> None: ...
+    def __setitem__(self, key: slice[SupportsIndex | None], value: ReadableBuffer, /) -> None: ...
     @overload
     def __setitem__(self, key: SupportsIndex | tuple[SupportsIndex, ...], value: _I, /) -> None: ...
     if sys.version_info >= (3, 10):
@@ -1010,7 +1010,7 @@ class tuple(Sequence[_T_co]):
     @overload
     def __getitem__(self, key: SupportsIndex, /) -> _T_co: ...
     @overload
-    def __getitem__(self, key: IndexSlice, /) -> tuple[_T_co, ...]: ...
+    def __getitem__(self, key: slice[SupportsIndex | None], /) -> tuple[_T_co, ...]: ...
     def __iter__(self) -> Iterator[_T_co]: ...
     def __lt__(self, value: tuple[_T_co, ...], /) -> bool: ...
     def __le__(self, value: tuple[_T_co, ...], /) -> bool: ...
@@ -1109,12 +1109,12 @@ class list(MutableSequence[_T]):
     @overload
     def __getitem__(self, i: SupportsIndex, /) -> _T: ...
     @overload
-    def __getitem__(self, s: IndexSlice, /) -> list[_T]: ...
+    def __getitem__(self, s: slice[SupportsIndex | None], /) -> list[_T]: ...
     @overload
     def __setitem__(self, key: SupportsIndex, value: _T, /) -> None: ...
     @overload
-    def __setitem__(self, key: IndexSlice, value: Iterable[_T], /) -> None: ...
-    def __delitem__(self, key: SupportsIndex | IndexSlice, /) -> None: ...
+    def __setitem__(self, key: slice[SupportsIndex | None], value: Iterable[_T], /) -> None: ...
+    def __delitem__(self, key: SupportsIndex | slice[SupportsIndex | None], /) -> None: ...
     # Overloading looks unnecessary, but is needed to work around complex mypy problems
     @overload
     def __add__(self, value: list[_T], /) -> list[_T]: ...
@@ -1310,7 +1310,7 @@ class range(Sequence[int]):
     @overload
     def __getitem__(self, key: SupportsIndex, /) -> int: ...
     @overload
-    def __getitem__(self, key: IndexSlice, /) -> range: ...
+    def __getitem__(self, key: slice[SupportsIndex | None], /) -> range: ...
     def __reversed__(self) -> Iterator[int]: ...
 
 class property:

stdlib/collections/__init__.pyi

@@ -129,12 +129,12 @@ class UserList(MutableSequence[_T]):
     @overload
     def __getitem__(self, i: SupportsIndex) -> _T: ...
     @overload
-    def __getitem__(self, i: IndexSlice) -> Self: ...
+    def __getitem__(self, i: slice[SupportsIndex | None]) -> Self: ...
     @overload
     def __setitem__(self, i: SupportsIndex, item: _T) -> None: ...
     @overload
-    def __setitem__(self, i: IndexSlice, item: Iterable[_T]) -> None: ...
-    def __delitem__(self, i: SupportsIndex | IndexSlice) -> None: ...
+    def __setitem__(self, i: slice[SupportsIndex | None], item: Iterable[_T]) -> None: ...
+    def __delitem__(self, i: SupportsIndex | slice[SupportsIndex | None]) -> None: ...
     def __add__(self, other: Iterable[_T]) -> Self: ...
     def __radd__(self, other: Iterable[_T]) -> Self: ...
     def __iadd__(self, other: Iterable[_T]) -> Self: ...
@@ -174,7 +174,7 @@ class UserString(Sequence[UserString]):
     def __hash__(self) -> int: ...
     def __contains__(self, char: object) -> bool: ...
     def __len__(self) -> int: ...
-    def __getitem__(self, index: SupportsIndex | IndexSlice) -> Self: ...
+    def __getitem__(self, index: SupportsIndex | slice[SupportsIndex | None]) -> Self: ...
     def __iter__(self) -> Iterator[Self]: ...
     def __reversed__(self) -> Iterator[Self]: ...
     def __add__(self, other: object) -> Self: ...

stdlib/typing.pyi

@@ -5,7 +5,7 @@ import collections  # noqa: F401  # pyright: ignore[reportUnusedImport]
 import sys
 import typing_extensions
 from _collections_abc import dict_items, dict_keys, dict_values
-from _typeshed import IdentityFunction, IndexSlice, ReadableBuffer, SupportsKeysAndGetItem
+from _typeshed import IdentityFunction, ReadableBuffer, SupportsKeysAndGetItem
 from abc import ABCMeta, abstractmethod
 from re import Match as Match, Pattern as Pattern
 from types import (
@@ -633,7 +633,7 @@ class Sequence(Reversible[_T_co], Collection[_T_co]):
     def __getitem__(self, index: int) -> _T_co: ...
     @overload
     @abstractmethod
-    def __getitem__(self, index: IndexSlice) -> Sequence[_T_co]: ...
+    def __getitem__(self, index: slice[SupportsIndex | None]) -> Sequence[_T_co]: ...
     # Mixin methods
     def index(self, value: Any, start: int = 0, stop: int = ...) -> int: ...
     def count(self, value: Any) -> int: ...
@@ -649,19 +649,19 @@ class MutableSequence(Sequence[_T]):
     def __getitem__(self, index: int) -> _T: ...
     @overload
     @abstractmethod
-    def __getitem__(self, index: IndexSlice) -> MutableSequence[_T]: ...
+    def __getitem__(self, index: slice[SupportsIndex | None]) -> MutableSequence[_T]: ...
     @overload
     @abstractmethod
     def __setitem__(self, index: int, value: _T) -> None: ...
     @overload
     @abstractmethod
-    def __setitem__(self, index: IndexSlice, value: Iterable[_T]) -> None: ...
+    def __setitem__(self, index: slice[SupportsIndex | None], value: Iterable[_T]) -> None: ...
     @overload
     @abstractmethod
     def __delitem__(self, index: int) -> None: ...
     @overload
     @abstractmethod
-    def __delitem__(self, index: IndexSlice) -> None: ...
+    def __delitem__(self, index: slice[SupportsIndex | None]) -> None: ...
     # Mixin methods
     def append(self, value: _T) -> None: ...
     def clear(self) -> None: ...