Use `slice[SupportesIndex | None] in more places that support it

Author: randolf-scholz

stdlib/logging/config.pyi

@@ -97,14 +97,14 @@ class ConvertingList(list[Any], ConvertingMixin):  # undocumented
     @overload
     def __getitem__(self, key: SupportsIndex) -> Any: ...
     @overload
-    def __getitem__(self, key: slice) -> Any: ...
+    def __getitem__(self, key: slice[SupportsIndex | None]) -> Any: ...
     def pop(self, idx: SupportsIndex = -1) -> Any: ...
 
 class ConvertingTuple(tuple[Any, ...], ConvertingMixin):  # undocumented
     @overload
     def __getitem__(self, key: SupportsIndex) -> Any: ...
     @overload
-    def __getitem__(self, key: slice) -> Any: ...
+    def __getitem__(self, key: slice[SupportsIndex | None]) -> Any: ...
 
 class BaseConfigurator:  # undocumented
     CONVERT_PATTERN: Pattern[str]

stdlib/mmap.pyi

@@ -2,7 +2,7 @@ import os
 import sys
 from _typeshed import ReadableBuffer, Unused
 from collections.abc import Iterator
-from typing import Final, Literal, NoReturn, overload
+from typing import Final, Literal, NoReturn, SupportsIndex, overload
 from typing_extensions import Self
 
 ACCESS_DEFAULT: Final = 0
@@ -76,14 +76,14 @@ class mmap:
     def read(self, n: int | None = None) -> bytes: ...
     def write(self, bytes: ReadableBuffer) -> int: ...
     @overload
-    def __getitem__(self, key: int, /) -> int: ...
+    def __getitem__(self, key: SupportsIndex, /) -> int: ...
     @overload
-    def __getitem__(self, key: slice, /) -> bytes: ...
-    def __delitem__(self, key: int | slice, /) -> NoReturn: ...
+    def __getitem__(self, key: slice[SupportsIndex | None], /) -> bytes: ...
+    def __delitem__(self, key: SupportsIndex | slice[SupportsIndex | None], /) -> NoReturn: ...
     @overload
-    def __setitem__(self, key: int, value: int, /) -> None: ...
+    def __setitem__(self, key: SupportsIndex, value: int, /) -> None: ...
     @overload
-    def __setitem__(self, key: slice, value: ReadableBuffer, /) -> None: ...
+    def __setitem__(self, key: slice[SupportsIndex | None], value: ReadableBuffer, /) -> None: ...
     # Doesn't actually exist, but the object actually supports "in" because it has __getitem__,
     # so we claim that there is also a __contains__ to help type checkers.
     def __contains__(self, o: object, /) -> bool: ...

stdlib/multiprocessing/managers.pyi

@@ -171,15 +171,15 @@ class BaseListProxy(BaseProxy, MutableSequence[_T]):
     __builtins__: ClassVar[dict[str, Any]]
     def __len__(self) -> int: ...
     def __add__(self, x: list[_T], /) -> list[_T]: ...
-    def __delitem__(self, i: SupportsIndex | slice, /) -> None: ...
+    def __delitem__(self, i: SupportsIndex | slice[SupportsIndex | None], /) -> None: ...
     @overload
     def __getitem__(self, i: SupportsIndex, /) -> _T: ...
     @overload
-    def __getitem__(self, s: slice, /) -> list[_T]: ...
+    def __getitem__(self, s: slice[SupportsIndex | None], /) -> list[_T]: ...
     @overload
     def __setitem__(self, i: SupportsIndex, o: _T, /) -> None: ...
     @overload
-    def __setitem__(self, s: slice, o: Iterable[_T], /) -> None: ...
+    def __setitem__(self, s: slice[SupportsIndex | None], o: Iterable[_T], /) -> None: ...
     def __mul__(self, n: SupportsIndex, /) -> list[_T]: ...
     def __rmul__(self, n: SupportsIndex, /) -> list[_T]: ...
     def __imul__(self, value: SupportsIndex, /) -> Self: ...

stdlib/multiprocessing/sharedctypes.pyi

@@ -5,7 +5,7 @@ from ctypes import _SimpleCData, c_char
 from multiprocessing.context import BaseContext
 from multiprocessing.synchronize import _LockLike
 from types import TracebackType
-from typing import Any, Generic, Literal, Protocol, TypeVar, overload
+from typing import Any, Generic, Literal, Protocol, SupportsIndex, TypeVar, overload
 
 __all__ = ["RawValue", "RawArray", "Value", "Array", "copy", "synchronized"]
 
@@ -103,27 +103,27 @@ class Synchronized(SynchronizedBase[_SimpleCData[_T]], Generic[_T]):
 class SynchronizedArray(SynchronizedBase[ctypes.Array[_SimpleCData[_T]]], Generic[_T]):
     def __len__(self) -> int: ...
     @overload
-    def __getitem__(self, i: slice) -> list[_T]: ...
+    def __getitem__(self, i: slice[SupportsIndex | None]) -> list[_T]: ...
     @overload
-    def __getitem__(self, i: int) -> _T: ...
+    def __getitem__(self, i: SupportsIndex) -> _T: ...
     @overload
-    def __setitem__(self, i: slice, value: Iterable[_T]) -> None: ...
+    def __setitem__(self, i: slice[SupportsIndex | None], value: Iterable[_T]) -> None: ...
     @overload
-    def __setitem__(self, i: int, value: _T) -> None: ...
-    def __getslice__(self, start: int, stop: int) -> list[_T]: ...
-    def __setslice__(self, start: int, stop: int, values: Iterable[_T]) -> None: ...
+    def __setitem__(self, i: SupportsIndex, value: _T) -> None: ...
+    def __getslice__(self, start: SupportsIndex, stop: SupportsIndex) -> list[_T]: ...
+    def __setslice__(self, start: SupportsIndex, stop: SupportsIndex, values: Iterable[_T]) -> None: ...
 
 class SynchronizedString(SynchronizedArray[bytes]):
     @overload  # type: ignore[override]
-    def __getitem__(self, i: slice) -> bytes: ...
+    def __getitem__(self, i: slice[SupportsIndex | None]) -> bytes: ...
     @overload
-    def __getitem__(self, i: int) -> bytes: ...
+    def __getitem__(self, i: SupportsIndex) -> bytes: ...
     @overload  # type: ignore[override]
-    def __setitem__(self, i: slice, value: bytes) -> None: ...
+    def __setitem__(self, i: slice[SupportsIndex | None], value: bytes) -> None: ...
     @overload
-    def __setitem__(self, i: int, value: bytes) -> None: ...
-    def __getslice__(self, start: int, stop: int) -> bytes: ...  # type: ignore[override]
-    def __setslice__(self, start: int, stop: int, values: bytes) -> None: ...  # type: ignore[override]
+    def __setitem__(self, i: SupportsIndex, value: bytes) -> None: ...
+    def __getslice__(self, start: SupportsIndex, stop: SupportsIndex) -> bytes: ...  # type: ignore[override]
+    def __setslice__(self, start: SupportsIndex, stop: SupportsIndex, values: bytes) -> None: ...  # type: ignore[override]
 
     value: bytes
     raw: bytes

stdlib/sqlite3/__init__.pyi

@@ -435,10 +435,10 @@ class PrepareProtocol:
 class Row(Sequence[Any]):
     def __new__(cls, cursor: Cursor, data: tuple[Any, ...], /) -> Self: ...
     def keys(self) -> list[str]: ...
-    @overload
+    @overload  # Note: really needs int instead of SupportsIndex
     def __getitem__(self, key: int | str, /) -> Any: ...
-    @overload
-    def __getitem__(self, key: slice, /) -> tuple[Any, ...]: ...
+    @overload  # Note: SupportsIndex does work within slices.
+    def __getitem__(self, key: slice[SupportsIndex | None], /) -> tuple[Any, ...]: ...
     def __hash__(self) -> int: ...
     def __iter__(self) -> Iterator[Any]: ...
     def __len__(self) -> int: ...

stdlib/traceback.pyi

@@ -2,7 +2,7 @@ import sys
 from _typeshed import SupportsWrite, Unused
 from collections.abc import Generator, Iterable, Iterator, Mapping
 from types import FrameType, TracebackType
-from typing import Any, ClassVar, Literal, overload
+from typing import Any, ClassVar, Literal, SupportsIndex, overload
 from typing_extensions import Self, TypeAlias, deprecated
 
 __all__ = [
@@ -288,9 +288,9 @@ class FrameSummary:
     @overload
     def __getitem__(self, pos: Literal[3]) -> str | None: ...
     @overload
-    def __getitem__(self, pos: int) -> Any: ...
+    def __getitem__(self, pos: SupportsIndex) -> Any: ...
     @overload
-    def __getitem__(self, pos: slice) -> tuple[Any, ...]: ...
+    def __getitem__(self, pos: slice[SupportsIndex | None]) -> tuple[Any, ...]: ...
     def __iter__(self) -> Iterator[Any]: ...
     def __eq__(self, other: object) -> bool: ...
     def __len__(self) -> Literal[4]: ...

stdlib/tracemalloc.pyi

@@ -90,7 +90,7 @@ class Traceback(Sequence[Frame]):
     @overload
     def __getitem__(self, index: SupportsIndex) -> Frame: ...
     @overload
-    def __getitem__(self, index: slice) -> Sequence[Frame]: ...
+    def __getitem__(self, index: slice[SupportsIndex | None]) -> Sequence[Frame]: ...
     def __contains__(self, frame: Frame) -> bool: ...  # type: ignore[override]
     def __len__(self) -> int: ...
     def __eq__(self, other: object) -> bool: ...

stdlib/xml/etree/ElementTree.pyi

@@ -124,14 +124,14 @@ class Element(Generic[_Tag]):
     @overload
     def __getitem__(self, key: SupportsIndex, /) -> Element: ...
     @overload
-    def __getitem__(self, key: slice, /) -> list[Element]: ...
+    def __getitem__(self, key: slice[SupportsIndex | None], /) -> list[Element]: ...
     def __len__(self) -> int: ...
     # Doesn't actually exist at runtime, but instance of the class are indeed iterable due to __getitem__.
     def __iter__(self) -> Iterator[Element]: ...
     @overload
     def __setitem__(self, key: SupportsIndex, value: Element, /) -> None: ...
     @overload
-    def __setitem__(self, key: slice, value: Iterable[Element], /) -> None: ...
+    def __setitem__(self, key: slice[SupportsIndex | None], value: Iterable[Element], /) -> None: ...
 
     # Doesn't really exist in earlier versions, where __len__ is called implicitly instead
     @deprecated("Testing an element's truth value is deprecated.")