Stdlib: correct many parameter names (#9815)

2025-12-07 04:34:28 +08:00 · 2023-03-04 09:53:12 +00:00
parent 4b755c7034
commit 257e287fec
30 changed files with 382 additions and 353 deletions
--- a/stdlib/_tkinter.pyi
+++ b/stdlib/_tkinter.pyi
@@ -22,12 +22,12 @@ class Tcl_Obj:
    @property
    def typename(self) -> str: ...
    __hash__: ClassVar[None]  # type: ignore[assignment]
-    def __eq__(self, __other): ...
-    def __ge__(self, __other): ...
-    def __gt__(self, __other): ...
-    def __le__(self, __other): ...
-    def __lt__(self, __other): ...
-    def __ne__(self, __other): ...
+    def __eq__(self, __value): ...
+    def __ge__(self, __value): ...
+    def __gt__(self, __value): ...
+    def __le__(self, __value): ...
+    def __lt__(self, __value): ...
+    def __ne__(self, __value): ...

 class TclError(Exception): ...

--- a/stdlib/array.pyi
+++ b/stdlib/array.pyi
@@ -61,23 +61,23 @@ class array(MutableSequence[_T], Generic[_T]):

    def __len__(self) -> int: ...
    @overload
-    def __getitem__(self, __i: SupportsIndex) -> _T: ...
+    def __getitem__(self, __key: SupportsIndex) -> _T: ...
    @overload
-    def __getitem__(self, __s: slice) -> array[_T]: ...
+    def __getitem__(self, __key: slice) -> array[_T]: ...
    @overload  # type: ignore[override]
-    def __setitem__(self, __i: SupportsIndex, __o: _T) -> None: ...
+    def __setitem__(self, __key: SupportsIndex, __value: _T) -> None: ...
    @overload
-    def __setitem__(self, __s: slice, __o: array[_T]) -> None: ...
-    def __delitem__(self, __i: SupportsIndex | slice) -> None: ...
-    def __add__(self, __x: array[_T]) -> array[_T]: ...
-    def __ge__(self, __other: array[_T]) -> bool: ...
-    def __gt__(self, __other: array[_T]) -> bool: ...
-    def __iadd__(self, __x: array[_T]) -> Self: ...  # type: ignore[override]
-    def __imul__(self, __n: int) -> Self: ...
-    def __le__(self, __other: array[_T]) -> bool: ...
-    def __lt__(self, __other: array[_T]) -> bool: ...
-    def __mul__(self, __n: int) -> array[_T]: ...
-    def __rmul__(self, __n: int) -> array[_T]: ...
+    def __setitem__(self, __key: slice, __value: array[_T]) -> None: ...
+    def __delitem__(self, __key: SupportsIndex | slice) -> None: ...
+    def __add__(self, __value: array[_T]) -> array[_T]: ...
+    def __ge__(self, __value: array[_T]) -> bool: ...
+    def __gt__(self, __value: array[_T]) -> bool: ...
+    def __iadd__(self, __value: array[_T]) -> Self: ...  # type: ignore[override]
+    def __imul__(self, __value: int) -> Self: ...
+    def __le__(self, __value: array[_T]) -> bool: ...
+    def __lt__(self, __value: array[_T]) -> bool: ...
+    def __mul__(self, __value: int) -> array[_T]: ...
+    def __rmul__(self, __value: int) -> array[_T]: ...
    def __copy__(self) -> array[_T]: ...
    def __deepcopy__(self, __unused: Any) -> array[_T]: ...

--- a/stdlib/builtins.pyi
+++ b/stdlib/builtins.pyi
@@ -92,8 +92,8 @@ class object:
    # Overriding them in subclasses has different semantics, even if the override has an identical signature.
    def __setattr__(self, __name: str, __value: Any) -> None: ...
    def __delattr__(self, __name: str) -> None: ...
-    def __eq__(self, __o: object) -> bool: ...
-    def __ne__(self, __o: object) -> bool: ...
+    def __eq__(self, __value: object) -> bool: ...
+    def __ne__(self, __value: object) -> bool: ...
    def __str__(self) -> str: ...  # noqa: Y029
    def __repr__(self) -> str: ...  # noqa: Y029
    def __hash__(self) -> int: ...
@@ -183,8 +183,8 @@ class type:
    @classmethod
    def __prepare__(metacls, __name: str, __bases: tuple[type, ...], **kwds: Any) -> Mapping[str, object]: ...
    if sys.version_info >= (3, 10):
-        def __or__(self, __t: Any) -> types.UnionType: ...
-        def __ror__(self, __t: Any) -> types.UnionType: ...
+        def __or__(self, __value: Any) -> types.UnionType: ...
+        def __ror__(self, __value: Any) -> types.UnionType: ...

 class super:
    @overload
@@ -242,45 +242,45 @@ class int:
            signed: bool = False,
        ) -> Self: ...

-    def __add__(self, __x: int) -> int: ...
-    def __sub__(self, __x: int) -> int: ...
-    def __mul__(self, __x: int) -> int: ...
-    def __floordiv__(self, __x: int) -> int: ...
-    def __truediv__(self, __x: int) -> float: ...
-    def __mod__(self, __x: int) -> int: ...
-    def __divmod__(self, __x: int) -> tuple[int, int]: ...
-    def __radd__(self, __x: int) -> int: ...
-    def __rsub__(self, __x: int) -> int: ...
-    def __rmul__(self, __x: int) -> int: ...
-    def __rfloordiv__(self, __x: int) -> int: ...
-    def __rtruediv__(self, __x: int) -> float: ...
-    def __rmod__(self, __x: int) -> int: ...
-    def __rdivmod__(self, __x: int) -> tuple[int, int]: ...
+    def __add__(self, __value: int) -> int: ...
+    def __sub__(self, __value: int) -> int: ...
+    def __mul__(self, __value: int) -> int: ...
+    def __floordiv__(self, __value: int) -> int: ...
+    def __truediv__(self, __value: int) -> float: ...
+    def __mod__(self, __value: int) -> int: ...
+    def __divmod__(self, __value: int) -> tuple[int, int]: ...
+    def __radd__(self, __value: int) -> int: ...
+    def __rsub__(self, __value: int) -> int: ...
+    def __rmul__(self, __value: int) -> int: ...
+    def __rfloordiv__(self, __value: int) -> int: ...
+    def __rtruediv__(self, __value: int) -> float: ...
+    def __rmod__(self, __value: int) -> int: ...
+    def __rdivmod__(self, __value: int) -> tuple[int, int]: ...
    @overload
    def __pow__(self, __x: Literal[0]) -> Literal[1]: ...
    @overload
-    def __pow__(self, __x: Literal[0], __modulo: None) -> Literal[1]: ...
+    def __pow__(self, __value: Literal[0], __mod: None) -> Literal[1]: ...
    @overload
-    def __pow__(self, __x: _PositiveInteger, __modulo: None = None) -> int: ...
+    def __pow__(self, __value: _PositiveInteger, __mod: None = None) -> int: ...
    @overload
-    def __pow__(self, __x: _NegativeInteger, __modulo: None = None) -> float: ...
+    def __pow__(self, __value: _NegativeInteger, __mod: None = None) -> float: ...
    # positive x -> int; negative x -> float
    # return type must be Any as `int | float` causes too many false-positive errors
    @overload
-    def __pow__(self, __x: int, __modulo: None = None) -> Any: ...
+    def __pow__(self, __value: int, __mod: None = None) -> Any: ...
    @overload
-    def __pow__(self, __x: int, __modulo: int) -> int: ...
-    def __rpow__(self, __x: int, __mod: int | None = None) -> Any: ...
-    def __and__(self, __n: int) -> int: ...
-    def __or__(self, __n: int) -> int: ...
-    def __xor__(self, __n: int) -> int: ...
-    def __lshift__(self, __n: int) -> int: ...
-    def __rshift__(self, __n: int) -> int: ...
-    def __rand__(self, __n: int) -> int: ...
-    def __ror__(self, __n: int) -> int: ...
-    def __rxor__(self, __n: int) -> int: ...
-    def __rlshift__(self, __n: int) -> int: ...
-    def __rrshift__(self, __n: int) -> int: ...
+    def __pow__(self, __value: int, __mod: int) -> int: ...
+    def __rpow__(self, __value: int, __mod: int | None = None) -> Any: ...
+    def __and__(self, __value: int) -> int: ...
+    def __or__(self, __value: int) -> int: ...
+    def __xor__(self, __value: int) -> int: ...
+    def __lshift__(self, __value: int) -> int: ...
+    def __rshift__(self, __value: int) -> int: ...
+    def __rand__(self, __value: int) -> int: ...
+    def __ror__(self, __value: int) -> int: ...
+    def __rxor__(self, __value: int) -> int: ...
+    def __rlshift__(self, __value: int) -> int: ...
+    def __rrshift__(self, __value: int) -> int: ...
    def __neg__(self) -> int: ...
    def __pos__(self) -> int: ...
    def __invert__(self) -> int: ...
@@ -289,12 +289,12 @@ class int:
    def __floor__(self) -> int: ...
    def __round__(self, __ndigits: SupportsIndex = ...) -> int: ...
    def __getnewargs__(self) -> tuple[int]: ...
-    def __eq__(self, __x: object) -> bool: ...
-    def __ne__(self, __x: object) -> bool: ...
-    def __lt__(self, __x: int) -> bool: ...
-    def __le__(self, __x: int) -> bool: ...
-    def __gt__(self, __x: int) -> bool: ...
-    def __ge__(self, __x: int) -> bool: ...
+    def __eq__(self, __value: object) -> bool: ...
+    def __ne__(self, __value: object) -> bool: ...
+    def __lt__(self, __value: int) -> bool: ...
+    def __le__(self, __value: int) -> bool: ...
+    def __gt__(self, __value: int) -> bool: ...
+    def __ge__(self, __value: int) -> bool: ...
    def __float__(self) -> float: ...
    def __int__(self) -> int: ...
    def __abs__(self) -> int: ...
@@ -307,39 +307,39 @@ class float:
    def hex(self) -> str: ...
    def is_integer(self) -> bool: ...
    @classmethod
-    def fromhex(cls, __s: str) -> Self: ...
+    def fromhex(cls, __string: str) -> Self: ...
    @property
    def real(self) -> float: ...
    @property
    def imag(self) -> float: ...
    def conjugate(self) -> float: ...
-    def __add__(self, __x: float) -> float: ...
-    def __sub__(self, __x: float) -> float: ...
-    def __mul__(self, __x: float) -> float: ...
-    def __floordiv__(self, __x: float) -> float: ...
-    def __truediv__(self, __x: float) -> float: ...
-    def __mod__(self, __x: float) -> float: ...
-    def __divmod__(self, __x: float) -> tuple[float, float]: ...
+    def __add__(self, __value: float) -> float: ...
+    def __sub__(self, __value: float) -> float: ...
+    def __mul__(self, __value: float) -> float: ...
+    def __floordiv__(self, __value: float) -> float: ...
+    def __truediv__(self, __value: float) -> float: ...
+    def __mod__(self, __value: float) -> float: ...
+    def __divmod__(self, __value: float) -> tuple[float, float]: ...
    @overload
-    def __pow__(self, __x: int, __mod: None = None) -> float: ...
+    def __pow__(self, __value: int, __mod: None = None) -> float: ...
    # positive x -> float; negative x -> complex
    # return type must be Any as `float | complex` causes too many false-positive errors
    @overload
-    def __pow__(self, __x: float, __mod: None = None) -> Any: ...
-    def __radd__(self, __x: float) -> float: ...
-    def __rsub__(self, __x: float) -> float: ...
-    def __rmul__(self, __x: float) -> float: ...
-    def __rfloordiv__(self, __x: float) -> float: ...
-    def __rtruediv__(self, __x: float) -> float: ...
-    def __rmod__(self, __x: float) -> float: ...
-    def __rdivmod__(self, __x: float) -> tuple[float, float]: ...
+    def __pow__(self, __value: float, __mod: None = None) -> Any: ...
+    def __radd__(self, __value: float) -> float: ...
+    def __rsub__(self, __value: float) -> float: ...
+    def __rmul__(self, __value: float) -> float: ...
+    def __rfloordiv__(self, __value: float) -> float: ...
+    def __rtruediv__(self, __value: float) -> float: ...
+    def __rmod__(self, __value: float) -> float: ...
+    def __rdivmod__(self, __value: float) -> tuple[float, float]: ...
    @overload
-    def __rpow__(self, __x: _PositiveInteger, __modulo: None = None) -> float: ...
+    def __rpow__(self, __value: _PositiveInteger, __mod: None = None) -> float: ...
    @overload
-    def __rpow__(self, __x: _NegativeInteger, __mod: None = None) -> complex: ...
+    def __rpow__(self, __value: _NegativeInteger, __mod: None = None) -> complex: ...
    # Returning `complex` for the general case gives too many false-positive errors.
    @overload
-    def __rpow__(self, __x: float, __mod: None = None) -> Any: ...
+    def __rpow__(self, __value: float, __mod: None = None) -> Any: ...
    def __getnewargs__(self) -> tuple[float]: ...
    def __trunc__(self) -> int: ...
    if sys.version_info >= (3, 9):
@@ -350,12 +350,12 @@ class float:
    def __round__(self, __ndigits: None = None) -> int: ...
    @overload
    def __round__(self, __ndigits: SupportsIndex) -> float: ...
-    def __eq__(self, __x: object) -> bool: ...
-    def __ne__(self, __x: object) -> bool: ...
-    def __lt__(self, __x: float) -> bool: ...
-    def __le__(self, __x: float) -> bool: ...
-    def __gt__(self, __x: float) -> bool: ...
-    def __ge__(self, __x: float) -> bool: ...
+    def __eq__(self, __value: object) -> bool: ...
+    def __ne__(self, __value: object) -> bool: ...
+    def __lt__(self, __value: float) -> bool: ...
+    def __le__(self, __value: float) -> bool: ...
+    def __gt__(self, __value: float) -> bool: ...
+    def __ge__(self, __value: float) -> bool: ...
    def __neg__(self) -> float: ...
    def __pos__(self) -> float: ...
    def __int__(self) -> int: ...
@@ -385,18 +385,18 @@ class complex:
    @property
    def imag(self) -> float: ...
    def conjugate(self) -> complex: ...
-    def __add__(self, __x: complex) -> complex: ...
-    def __sub__(self, __x: complex) -> complex: ...
-    def __mul__(self, __x: complex) -> complex: ...
-    def __pow__(self, __x: complex, __mod: None = None) -> complex: ...
-    def __truediv__(self, __x: complex) -> complex: ...
-    def __radd__(self, __x: complex) -> complex: ...
-    def __rsub__(self, __x: complex) -> complex: ...
-    def __rmul__(self, __x: complex) -> complex: ...
-    def __rpow__(self, __x: complex, __mod: None = None) -> complex: ...
-    def __rtruediv__(self, __x: complex) -> complex: ...
-    def __eq__(self, __x: object) -> bool: ...
-    def __ne__(self, __x: object) -> bool: ...
+    def __add__(self, __value: complex) -> complex: ...
+    def __sub__(self, __value: complex) -> complex: ...
+    def __mul__(self, __value: complex) -> complex: ...
+    def __pow__(self, __value: complex, __mod: None = None) -> complex: ...
+    def __truediv__(self, __value: complex) -> complex: ...
+    def __radd__(self, __value: complex) -> complex: ...
+    def __rsub__(self, __value: complex) -> complex: ...
+    def __rmul__(self, __value: complex) -> complex: ...
+    def __rpow__(self, __value: complex, __mod: None = None) -> complex: ...
+    def __rtruediv__(self, __value: complex) -> complex: ...
+    def __eq__(self, __value: object) -> bool: ...
+    def __ne__(self, __value: object) -> bool: ...
    def __neg__(self) -> complex: ...
    def __pos__(self) -> complex: ...
    def __abs__(self) -> float: ...
@@ -558,35 +558,35 @@ class str(Sequence[str]):
    @overload
    def maketrans(__x: str, __y: str, __z: str) -> dict[int, int | None]: ...
    @overload
-    def __add__(self: LiteralString, __s: LiteralString) -> LiteralString: ...
+    def __add__(self: LiteralString, __value: LiteralString) -> LiteralString: ...
    @overload
-    def __add__(self, __s: str) -> str: ...  # type: ignore[misc]
+    def __add__(self, __value: str) -> str: ...  # type: ignore[misc]
    # Incompatible with Sequence.__contains__
-    def __contains__(self, __o: str) -> bool: ...  # type: ignore[override]
-    def __eq__(self, __x: object) -> bool: ...
-    def __ge__(self, __x: str) -> bool: ...
-    def __getitem__(self, __i: SupportsIndex | slice) -> str: ...
-    def __gt__(self, __x: str) -> bool: ...
+    def __contains__(self, __key: str) -> bool: ...  # type: ignore[override]
+    def __eq__(self, __value: object) -> bool: ...
+    def __ge__(self, __value: str) -> bool: ...
+    def __getitem__(self, __key: SupportsIndex | slice) -> str: ...
+    def __gt__(self, __value: str) -> bool: ...
    @overload
    def __iter__(self: LiteralString) -> Iterator[LiteralString]: ...
    @overload
    def __iter__(self) -> Iterator[str]: ...  # type: ignore[misc]
-    def __le__(self, __x: str) -> bool: ...
+    def __le__(self, __value: str) -> bool: ...
    def __len__(self) -> int: ...
-    def __lt__(self, __x: str) -> bool: ...
+    def __lt__(self, __value: str) -> bool: ...
    @overload
-    def __mod__(self: LiteralString, __x: LiteralString | tuple[LiteralString, ...]) -> LiteralString: ...
+    def __mod__(self: LiteralString, __value: LiteralString | tuple[LiteralString, ...]) -> LiteralString: ...
    @overload
-    def __mod__(self, __x: Any) -> str: ...
+    def __mod__(self, __value: Any) -> str: ...
    @overload
-    def __mul__(self: LiteralString, __n: SupportsIndex) -> LiteralString: ...
+    def __mul__(self: LiteralString, __value: SupportsIndex) -> LiteralString: ...
    @overload
-    def __mul__(self, __n: SupportsIndex) -> str: ...  # type: ignore[misc]
-    def __ne__(self, __x: object) -> bool: ...
+    def __mul__(self, __value: SupportsIndex) -> str: ...  # type: ignore[misc]
+    def __ne__(self, __value: object) -> bool: ...
    @overload
-    def __rmul__(self: LiteralString, __n: SupportsIndex) -> LiteralString: ...
+    def __rmul__(self: LiteralString, __value: SupportsIndex) -> LiteralString: ...
    @overload
-    def __rmul__(self, __n: SupportsIndex) -> str: ...  # type: ignore[misc]
+    def __rmul__(self, __value: SupportsIndex) -> str: ...  # type: ignore[misc]
    def __getnewargs__(self) -> tuple[str]: ...

 class bytes(ByteString):
@@ -667,27 +667,27 @@ class bytes(ByteString):
    def upper(self) -> bytes: ...
    def zfill(self, __width: SupportsIndex) -> bytes: ...
    @classmethod
-    def fromhex(cls, __s: str) -> Self: ...
+    def fromhex(cls, __string: str) -> Self: ...
    @staticmethod
    def maketrans(__frm: ReadableBuffer, __to: ReadableBuffer) -> bytes: ...
    def __len__(self) -> int: ...
    def __iter__(self) -> Iterator[int]: ...
    @overload
-    def __getitem__(self, __i: SupportsIndex) -> int: ...
+    def __getitem__(self, __key: SupportsIndex) -> int: ...
    @overload
-    def __getitem__(self, __s: slice) -> bytes: ...
-    def __add__(self, __s: ReadableBuffer) -> bytes: ...
-    def __mul__(self, __n: SupportsIndex) -> bytes: ...
-    def __rmul__(self, __n: SupportsIndex) -> bytes: ...
+    def __getitem__(self, __key: slice) -> bytes: ...
+    def __add__(self, __value: ReadableBuffer) -> bytes: ...
+    def __mul__(self, __value: SupportsIndex) -> bytes: ...
+    def __rmul__(self, __value: SupportsIndex) -> bytes: ...
    def __mod__(self, __value: Any) -> bytes: ...
    # Incompatible with Sequence.__contains__
-    def __contains__(self, __o: SupportsIndex | ReadableBuffer) -> bool: ...  # type: ignore[override]
-    def __eq__(self, __x: object) -> bool: ...
-    def __ne__(self, __x: object) -> bool: ...
-    def __lt__(self, __x: bytes) -> bool: ...
-    def __le__(self, __x: bytes) -> bool: ...
-    def __gt__(self, __x: bytes) -> bool: ...
-    def __ge__(self, __x: bytes) -> bool: ...
+    def __contains__(self, __key: SupportsIndex | ReadableBuffer) -> bool: ...  # type: ignore[override]
+    def __eq__(self, __value: object) -> bool: ...
+    def __ne__(self, __value: object) -> bool: ...
+    def __lt__(self, __value: bytes) -> bool: ...
+    def __le__(self, __value: bytes) -> bool: ...
+    def __gt__(self, __value: bytes) -> bool: ...
+    def __ge__(self, __value: bytes) -> bool: ...
    def __getnewargs__(self) -> tuple[bytes]: ...
    if sys.version_info >= (3, 11):
        def __bytes__(self) -> bytes: ...
@@ -783,29 +783,29 @@ class bytearray(MutableSequence[int], ByteString):
    def __iter__(self) -> Iterator[int]: ...
    __hash__: ClassVar[None]  # type: ignore[assignment]
    @overload
-    def __getitem__(self, __i: SupportsIndex) -> int: ...
+    def __getitem__(self, __key: SupportsIndex) -> int: ...
    @overload
-    def __getitem__(self, __s: slice) -> bytearray: ...
+    def __getitem__(self, __key: slice) -> bytearray: ...
    @overload
-    def __setitem__(self, __i: SupportsIndex, __x: SupportsIndex) -> None: ...
+    def __setitem__(self, __key: SupportsIndex, __value: SupportsIndex) -> None: ...
    @overload
-    def __setitem__(self, __s: slice, __x: Iterable[SupportsIndex] | bytes) -> None: ...
-    def __delitem__(self, __i: SupportsIndex | slice) -> None: ...
-    def __add__(self, __s: ReadableBuffer) -> bytearray: ...
+    def __setitem__(self, __key: slice, __value: Iterable[SupportsIndex] | bytes) -> None: ...
+    def __delitem__(self, __key: SupportsIndex | slice) -> None: ...
+    def __add__(self, __value: ReadableBuffer) -> bytearray: ...
    # The superclass wants us to accept Iterable[int], but that fails at runtime.
-    def __iadd__(self, __s: ReadableBuffer) -> Self: ...  # type: ignore[override]
-    def __mul__(self, __n: SupportsIndex) -> bytearray: ...
-    def __rmul__(self, __n: SupportsIndex) -> bytearray: ...
-    def __imul__(self, __n: SupportsIndex) -> Self: ...
+    def __iadd__(self, __value: ReadableBuffer) -> Self: ...  # type: ignore[override]
+    def __mul__(self, __value: SupportsIndex) -> bytearray: ...
+    def __rmul__(self, __value: SupportsIndex) -> bytearray: ...
+    def __imul__(self, __value: SupportsIndex) -> Self: ...
    def __mod__(self, __value: Any) -> bytes: ...
    # Incompatible with Sequence.__contains__
-    def __contains__(self, __o: SupportsIndex | ReadableBuffer) -> bool: ...  # type: ignore[override]
-    def __eq__(self, __x: object) -> bool: ...
-    def __ne__(self, __x: object) -> bool: ...
-    def __lt__(self, __x: ReadableBuffer) -> bool: ...
-    def __le__(self, __x: ReadableBuffer) -> bool: ...
-    def __gt__(self, __x: ReadableBuffer) -> bool: ...
-    def __ge__(self, __x: ReadableBuffer) -> bool: ...
+    def __contains__(self, __key: SupportsIndex | ReadableBuffer) -> bool: ...  # type: ignore[override]
+    def __eq__(self, __value: object) -> bool: ...
+    def __ne__(self, __value: object) -> bool: ...
+    def __lt__(self, __value: ReadableBuffer) -> bool: ...
+    def __le__(self, __value: ReadableBuffer) -> bool: ...
+    def __gt__(self, __value: ReadableBuffer) -> bool: ...
+    def __ge__(self, __value: ReadableBuffer) -> bool: ...
    def __alloc__(self) -> int: ...

@final
@@ -841,16 +841,16 @@ class memoryview(Sequence[int]):
    ) -> None: ...
    def cast(self, format: str, shape: list[int] | tuple[int, ...] = ...) -> memoryview: ...
    @overload
-    def __getitem__(self, __i: SupportsIndex) -> int: ...
+    def __getitem__(self, __key: SupportsIndex) -> int: ...
    @overload
-    def __getitem__(self, __s: slice) -> memoryview: ...
+    def __getitem__(self, __key: slice) -> memoryview: ...
    def __contains__(self, __x: object) -> bool: ...
    def __iter__(self) -> Iterator[int]: ...
    def __len__(self) -> int: ...
    @overload
-    def __setitem__(self, __s: slice, __o: ReadableBuffer) -> None: ...
+    def __setitem__(self, __key: slice, __value: ReadableBuffer) -> None: ...
    @overload
-    def __setitem__(self, __i: SupportsIndex, __o: SupportsIndex) -> None: ...
+    def __setitem__(self, __key: SupportsIndex, __value: SupportsIndex) -> None: ...
    if sys.version_info >= (3, 10):
        def tobytes(self, order: Literal["C", "F", "A"] | None = "C") -> bytes: ...
    elif sys.version_info >= (3, 8):
@@ -874,29 +874,29 @@ class bool(int):
    # The following overloads could be represented more elegantly with a TypeVar("_B", bool, int),
    # however mypy has a bug regarding TypeVar constraints (https://github.com/python/mypy/issues/11880).
    @overload
-    def __and__(self, __x: bool) -> bool: ...
+    def __and__(self, __value: bool) -> bool: ...
    @overload
-    def __and__(self, __x: int) -> int: ...
+    def __and__(self, __value: int) -> int: ...
    @overload
-    def __or__(self, __x: bool) -> bool: ...
+    def __or__(self, __value: bool) -> bool: ...
    @overload
-    def __or__(self, __x: int) -> int: ...
+    def __or__(self, __value: int) -> int: ...
    @overload
-    def __xor__(self, __x: bool) -> bool: ...
+    def __xor__(self, __value: bool) -> bool: ...
    @overload
-    def __xor__(self, __x: int) -> int: ...
+    def __xor__(self, __value: int) -> int: ...
    @overload
-    def __rand__(self, __x: bool) -> bool: ...
+    def __rand__(self, __value: bool) -> bool: ...
    @overload
-    def __rand__(self, __x: int) -> int: ...
+    def __rand__(self, __value: int) -> int: ...
    @overload
-    def __ror__(self, __x: bool) -> bool: ...
+    def __ror__(self, __value: bool) -> bool: ...
    @overload
-    def __ror__(self, __x: int) -> int: ...
+    def __ror__(self, __value: int) -> int: ...
    @overload
-    def __rxor__(self, __x: bool) -> bool: ...
+    def __rxor__(self, __value: bool) -> bool: ...
    @overload
-    def __rxor__(self, __x: int) -> int: ...
+    def __rxor__(self, __value: int) -> int: ...
    def __getnewargs__(self) -> tuple[int]: ...

@final
@@ -917,22 +917,22 @@ class slice:
 class tuple(Sequence[_T_co], Generic[_T_co]):
    def __new__(cls, __iterable: Iterable[_T_co] = ...) -> Self: ...
    def __len__(self) -> int: ...
-    def __contains__(self, __x: object) -> bool: ...
+    def __contains__(self, __key: object) -> bool: ...
    @overload
-    def __getitem__(self, __x: SupportsIndex) -> _T_co: ...
+    def __getitem__(self, __key: SupportsIndex) -> _T_co: ...
    @overload
-    def __getitem__(self, __x: slice) -> tuple[_T_co, ...]: ...
+    def __getitem__(self, __key: slice) -> tuple[_T_co, ...]: ...
    def __iter__(self) -> Iterator[_T_co]: ...
-    def __lt__(self, __x: tuple[_T_co, ...]) -> bool: ...
-    def __le__(self, __x: tuple[_T_co, ...]) -> bool: ...
-    def __gt__(self, __x: tuple[_T_co, ...]) -> bool: ...
-    def __ge__(self, __x: tuple[_T_co, ...]) -> bool: ...
+    def __lt__(self, __value: tuple[_T_co, ...]) -> bool: ...
+    def __le__(self, __value: tuple[_T_co, ...]) -> bool: ...
+    def __gt__(self, __value: tuple[_T_co, ...]) -> bool: ...
+    def __ge__(self, __value: tuple[_T_co, ...]) -> bool: ...
    @overload
-    def __add__(self, __x: tuple[_T_co, ...]) -> tuple[_T_co, ...]: ...
+    def __add__(self, __value: tuple[_T_co, ...]) -> tuple[_T_co, ...]: ...
    @overload
-    def __add__(self, __x: tuple[_T, ...]) -> tuple[_T_co | _T, ...]: ...
-    def __mul__(self, __n: SupportsIndex) -> tuple[_T_co, ...]: ...
-    def __rmul__(self, __n: SupportsIndex) -> tuple[_T_co, ...]: ...
+    def __add__(self, __value: tuple[_T, ...]) -> tuple[_T_co | _T, ...]: ...
+    def __mul__(self, __value: SupportsIndex) -> tuple[_T_co, ...]: ...
+    def __rmul__(self, __value: SupportsIndex) -> tuple[_T_co, ...]: ...
    def count(self, __value: Any) -> int: ...
    def index(self, __value: Any, __start: SupportsIndex = 0, __stop: SupportsIndex = sys.maxsize) -> int: ...
    if sys.version_info >= (3, 9):
@@ -994,25 +994,25 @@ class list(MutableSequence[_T], Generic[_T]):
    @overload
    def __getitem__(self, __s: slice) -> list[_T]: ...
    @overload
-    def __setitem__(self, __i: SupportsIndex, __o: _T) -> None: ...
+    def __setitem__(self, __key: SupportsIndex, __value: _T) -> None: ...
    @overload
-    def __setitem__(self, __s: slice, __o: Iterable[_T]) -> None: ...
-    def __delitem__(self, __i: SupportsIndex | slice) -> None: ...
+    def __setitem__(self, __key: slice, __value: Iterable[_T]) -> None: ...
+    def __delitem__(self, __key: SupportsIndex | slice) -> None: ...
    # Overloading looks unnecessary, but is needed to work around complex mypy problems
    @overload
-    def __add__(self, __x: list[_T]) -> list[_T]: ...
+    def __add__(self, __value: list[_T]) -> list[_T]: ...
    @overload
-    def __add__(self, __x: list[_S]) -> list[_S | _T]: ...
-    def __iadd__(self, __x: Iterable[_T]) -> Self: ...  # type: ignore[misc]
-    def __mul__(self, __n: SupportsIndex) -> list[_T]: ...
-    def __rmul__(self, __n: SupportsIndex) -> list[_T]: ...
-    def __imul__(self, __n: SupportsIndex) -> Self: ...
-    def __contains__(self, __o: object) -> bool: ...
+    def __add__(self, __value: list[_S]) -> list[_S | _T]: ...
+    def __iadd__(self, __value: Iterable[_T]) -> Self: ...  # type: ignore[misc]
+    def __mul__(self, __value: SupportsIndex) -> list[_T]: ...
+    def __rmul__(self, __value: SupportsIndex) -> list[_T]: ...
+    def __imul__(self, __value: SupportsIndex) -> Self: ...
+    def __contains__(self, __key: object) -> bool: ...
    def __reversed__(self) -> Iterator[_T]: ...
-    def __gt__(self, __x: list[_T]) -> bool: ...
-    def __ge__(self, __x: list[_T]) -> bool: ...
-    def __lt__(self, __x: list[_T]) -> bool: ...
-    def __le__(self, __x: list[_T]) -> bool: ...
+    def __gt__(self, __value: list[_T]) -> bool: ...
+    def __ge__(self, __value: list[_T]) -> bool: ...
+    def __lt__(self, __value: list[_T]) -> bool: ...
+    def __le__(self, __value: list[_T]) -> bool: ...
    if sys.version_info >= (3, 9):
        def __class_getitem__(cls, __item: Any) -> GenericAlias: ...

@@ -1099,18 +1099,18 @@ class set(MutableSet[_T], Generic[_T]):
    def __len__(self) -> int: ...
    def __contains__(self, __o: object) -> bool: ...
    def __iter__(self) -> Iterator[_T]: ...
-    def __and__(self, __s: AbstractSet[object]) -> set[_T]: ...
-    def __iand__(self, __s: AbstractSet[object]) -> Self: ...
-    def __or__(self, __s: AbstractSet[_S]) -> set[_T | _S]: ...
-    def __ior__(self, __s: AbstractSet[_T]) -> Self: ...  # type: ignore[override,misc]
-    def __sub__(self, __s: AbstractSet[_T | None]) -> set[_T]: ...
-    def __isub__(self, __s: AbstractSet[object]) -> Self: ...
-    def __xor__(self, __s: AbstractSet[_S]) -> set[_T | _S]: ...
-    def __ixor__(self, __s: AbstractSet[_T]) -> Self: ...  # type: ignore[override,misc]
-    def __le__(self, __s: AbstractSet[object]) -> bool: ...
-    def __lt__(self, __s: AbstractSet[object]) -> bool: ...
-    def __ge__(self, __s: AbstractSet[object]) -> bool: ...
-    def __gt__(self, __s: AbstractSet[object]) -> bool: ...
+    def __and__(self, __value: AbstractSet[object]) -> set[_T]: ...
+    def __iand__(self, __value: AbstractSet[object]) -> Self: ...
+    def __or__(self, __value: AbstractSet[_S]) -> set[_T | _S]: ...
+    def __ior__(self, __value: AbstractSet[_T]) -> Self: ...  # type: ignore[override,misc]
+    def __sub__(self, __value: AbstractSet[_T | None]) -> set[_T]: ...
+    def __isub__(self, __value: AbstractSet[object]) -> Self: ...
+    def __xor__(self, __value: AbstractSet[_S]) -> set[_T | _S]: ...
+    def __ixor__(self, __value: AbstractSet[_T]) -> Self: ...  # type: ignore[override,misc]
+    def __le__(self, __value: AbstractSet[object]) -> bool: ...
+    def __lt__(self, __value: AbstractSet[object]) -> bool: ...
+    def __ge__(self, __value: AbstractSet[object]) -> bool: ...
+    def __gt__(self, __value: AbstractSet[object]) -> bool: ...
    __hash__: ClassVar[None]  # type: ignore[assignment]
    if sys.version_info >= (3, 9):
        def __class_getitem__(cls, __item: Any) -> GenericAlias: ...
@@ -1131,14 +1131,14 @@ class frozenset(AbstractSet[_T_co], Generic[_T_co]):
    def __len__(self) -> int: ...
    def __contains__(self, __o: object) -> bool: ...
    def __iter__(self) -> Iterator[_T_co]: ...
-    def __and__(self, __s: AbstractSet[_T_co]) -> frozenset[_T_co]: ...
-    def __or__(self, __s: AbstractSet[_S]) -> frozenset[_T_co | _S]: ...
-    def __sub__(self, __s: AbstractSet[_T_co]) -> frozenset[_T_co]: ...
-    def __xor__(self, __s: AbstractSet[_S]) -> frozenset[_T_co | _S]: ...
-    def __le__(self, __s: AbstractSet[object]) -> bool: ...
-    def __lt__(self, __s: AbstractSet[object]) -> bool: ...
-    def __ge__(self, __s: AbstractSet[object]) -> bool: ...
-    def __gt__(self, __s: AbstractSet[object]) -> bool: ...
+    def __and__(self, __value: AbstractSet[_T_co]) -> frozenset[_T_co]: ...
+    def __or__(self, __value: AbstractSet[_S]) -> frozenset[_T_co | _S]: ...
+    def __sub__(self, __value: AbstractSet[_T_co]) -> frozenset[_T_co]: ...
+    def __xor__(self, __value: AbstractSet[_S]) -> frozenset[_T_co | _S]: ...
+    def __le__(self, __value: AbstractSet[object]) -> bool: ...
+    def __lt__(self, __value: AbstractSet[object]) -> bool: ...
+    def __ge__(self, __value: AbstractSet[object]) -> bool: ...
+    def __gt__(self, __value: AbstractSet[object]) -> bool: ...
    if sys.version_info >= (3, 9):
        def __class_getitem__(cls, __item: Any) -> GenericAlias: ...

@@ -1164,12 +1164,12 @@ class range(Sequence[int]):
    def count(self, __value: int) -> int: ...
    def index(self, __value: int) -> int: ...  # type: ignore[override]
    def __len__(self) -> int: ...
-    def __contains__(self, __o: object) -> bool: ...
+    def __contains__(self, __key: object) -> bool: ...
    def __iter__(self) -> Iterator[int]: ...
    @overload
-    def __getitem__(self, __i: SupportsIndex) -> int: ...
+    def __getitem__(self, __key: SupportsIndex) -> int: ...
    @overload
-    def __getitem__(self, __s: slice) -> range: ...
+    def __getitem__(self, __key: slice) -> range: ...
    def __reversed__(self) -> Iterator[int]: ...

 class property:
@@ -1648,35 +1648,35 @@ if sys.version_info >= (3, 8):

 else:
    @overload
-    def pow(__base: int, __exp: int, __mod: int) -> int: ...
+    def pow(__x: int, __y: int, __z: int) -> int: ...
    @overload
-    def pow(__base: int, __exp: Literal[0], __mod: None = None) -> Literal[1]: ...
+    def pow(__x: int, __y: Literal[0], __z: None = None) -> Literal[1]: ...
    @overload
-    def pow(__base: int, __exp: _PositiveInteger, __mod: None = None) -> int: ...
+    def pow(__x: int, __y: _PositiveInteger, __z: None = None) -> int: ...
    @overload
-    def pow(__base: int, __exp: _NegativeInteger, __mod: None = None) -> float: ...
+    def pow(__x: int, __y: _NegativeInteger, __z: None = None) -> float: ...
    @overload
-    def pow(__base: int, __exp: int, __mod: None = None) -> Any: ...
+    def pow(__x: int, __y: int, __z: None = None) -> Any: ...
    @overload
-    def pow(__base: _PositiveInteger, __exp: float, __mod: None = None) -> float: ...
+    def pow(__x: _PositiveInteger, __y: float, __z: None = None) -> float: ...
    @overload
-    def pow(__base: _NegativeInteger, __exp: float, __mod: None = None) -> complex: ...
+    def pow(__x: _NegativeInteger, __y: float, __z: None = None) -> complex: ...
    @overload
-    def pow(__base: float, __exp: int, __mod: None = None) -> float: ...
+    def pow(__x: float, __y: int, __z: None = None) -> float: ...
    @overload
-    def pow(__base: float, __exp: complex | _SupportsSomeKindOfPow, __mod: None = None) -> Any: ...
+    def pow(__x: float, __y: complex | _SupportsSomeKindOfPow, __z: None = None) -> Any: ...
    @overload
-    def pow(__base: complex, __exp: complex | _SupportsSomeKindOfPow, __mod: None = None) -> complex: ...
+    def pow(__x: complex, __y: complex | _SupportsSomeKindOfPow, __z: None = None) -> complex: ...
    @overload
-    def pow(__base: _SupportsPow2[_E, _T_co], __exp: _E, __mod: None = None) -> _T_co: ...
+    def pow(__x: _SupportsPow2[_E, _T_co], __y: _E, __z: None = None) -> _T_co: ...
    @overload
-    def pow(__base: _SupportsPow3NoneOnly[_E, _T_co], __exp: _E, __mod: None = None) -> _T_co: ...
+    def pow(__x: _SupportsPow3NoneOnly[_E, _T_co], __y: _E, __z: None = None) -> _T_co: ...
    @overload
-    def pow(__base: _SupportsPow3[_E, _M, _T_co], __exp: _E, __mod: _M) -> _T_co: ...
+    def pow(__x: _SupportsPow3[_E, _M, _T_co], __y: _E, __z: _M) -> _T_co: ...
    @overload
-    def pow(__base: _SupportsSomeKindOfPow, __exp: float, __mod: None = None) -> Any: ...
+    def pow(__x: _SupportsSomeKindOfPow, __y: float, __z: None = None) -> Any: ...
    @overload
-    def pow(__base: _SupportsSomeKindOfPow, __exp: complex, __mod: None = None) -> complex: ...
+    def pow(__x: _SupportsSomeKindOfPow, __y: complex, __z: None = None) -> complex: ...

 def quit(code: sys._ExitCode = None) -> NoReturn: ...

--- a/stdlib/collections/init.pyi
+++ b/stdlib/collections/init.pyi
@@ -236,19 +236,19 @@ class deque(MutableSequence[_T], Generic[_T]):
    def __copy__(self) -> Self: ...
    def __len__(self) -> int: ...
    # These methods of deque don't take slices, unlike MutableSequence, hence the type: ignores
-    def __getitem__(self, __index: SupportsIndex) -> _T: ...  # type: ignore[override]
-    def __setitem__(self, __i: SupportsIndex, __x: _T) -> None: ...  # type: ignore[override]
-    def __delitem__(self, __i: SupportsIndex) -> None: ...  # type: ignore[override]
-    def __contains__(self, __o: object) -> bool: ...
+    def __getitem__(self, __key: SupportsIndex) -> _T: ...  # type: ignore[override]
+    def __setitem__(self, __key: SupportsIndex, __value: _T) -> None: ...  # type: ignore[override]
+    def __delitem__(self, __key: SupportsIndex) -> None: ...  # type: ignore[override]
+    def __contains__(self, __key: object) -> bool: ...
    def __reduce__(self) -> tuple[type[Self], tuple[()], None, Iterator[_T]]: ...
-    def __iadd__(self, __iterable: Iterable[_T]) -> Self: ...
-    def __add__(self, __other: Self) -> Self: ...
-    def __mul__(self, __other: int) -> Self: ...
-    def __imul__(self, __other: int) -> Self: ...
-    def __lt__(self, __other: deque[_T]) -> bool: ...
-    def __le__(self, __other: deque[_T]) -> bool: ...
-    def __gt__(self, __other: deque[_T]) -> bool: ...
-    def __ge__(self, __other: deque[_T]) -> bool: ...
+    def __iadd__(self, __value: Iterable[_T]) -> Self: ...
+    def __add__(self, __value: Self) -> Self: ...
+    def __mul__(self, __value: int) -> Self: ...
+    def __imul__(self, __value: int) -> Self: ...
+    def __lt__(self, __value: deque[_T]) -> bool: ...
+    def __le__(self, __value: deque[_T]) -> bool: ...
+    def __gt__(self, __value: deque[_T]) -> bool: ...
+    def __ge__(self, __value: deque[_T]) -> bool: ...
    if sys.version_info >= (3, 9):
        def __class_getitem__(cls, __item: Any) -> GenericAlias: ...

--- a/stdlib/contextlib.pyi
+++ b/stdlib/contextlib.pyi
@@ -64,9 +64,14 @@ class _GeneratorContextManager(AbstractContextManager[_T_co], ContextDecorator,
    func: Callable[..., Generator[_T_co, Any, Any]]
    args: tuple[Any, ...]
    kwds: dict[str, Any]
-    def __exit__(
-        self, typ: type[BaseException] | None, value: BaseException | None, traceback: TracebackType | None
-    ) -> bool | None: ...
+    if sys.version_info >= (3, 9):
+        def __exit__(
+            self, typ: type[BaseException] | None, value: BaseException | None, traceback: TracebackType | None
+        ) -> bool | None: ...
+    else:
+        def __exit__(
+            self, type: type[BaseException] | None, value: BaseException | None, traceback: TracebackType | None
+        ) -> bool | None: ...

 def contextmanager(func: Callable[_P, Iterator[_T_co]]) -> Callable[_P, _GeneratorContextManager[_T_co]]: ...

--- a/stdlib/contextvars.pyi
+++ b/stdlib/contextvars.pyi
@@ -22,8 +22,13 @@ class ContextVar(Generic[_T]):
    def name(self) -> str: ...
    @overload
    def get(self) -> _T: ...
-    @overload
-    def get(self, default: _D | _T) -> _D | _T: ...
+    if sys.version_info >= (3, 8):
+        @overload
+        def get(self, default: _D | _T) -> _D | _T: ...
+    else:
+        @overload
+        def get(self, __default: _D | _T) -> _D | _T: ...
+
    def set(self, __value: _T) -> Token[_T]: ...
    def reset(self, __token: Token[_T]) -> None: ...
    if sys.version_info >= (3, 9):
--- a/stdlib/ctypes/init.pyi
+++ b/stdlib/ctypes/init.pyi
@@ -170,10 +170,10 @@ class _Pointer(Generic[_CT], _PointerLike, _CData):
    @overload
    def __init__(self, arg: _CT) -> None: ...
    @overload
-    def __getitem__(self, __i: int) -> Any: ...
+    def __getitem__(self, __key: int) -> Any: ...
    @overload
-    def __getitem__(self, __s: slice) -> list[Any]: ...
-    def __setitem__(self, __i: int, __o: Any) -> None: ...
+    def __getitem__(self, __key: slice) -> list[Any]: ...
+    def __setitem__(self, __key: int, __value: Any) -> None: ...

 def pointer(__arg: _CT) -> _Pointer[_CT]: ...
 def resize(obj: _CData, size: int) -> None: ...
@@ -291,13 +291,13 @@ class Array(Generic[_CT], _CData):
    # the array element type would belong are annotated with Any instead.
    def __init__(self, *args: Any) -> None: ...
    @overload
-    def __getitem__(self, __i: int) -> Any: ...
+    def __getitem__(self, __key: int) -> Any: ...
    @overload
-    def __getitem__(self, __s: slice) -> list[Any]: ...
+    def __getitem__(self, __key: slice) -> list[Any]: ...
    @overload
-    def __setitem__(self, __i: int, __o: Any) -> None: ...
+    def __setitem__(self, __key: int, __value: Any) -> None: ...
    @overload
-    def __setitem__(self, __s: slice, __o: Iterable[Any]) -> None: ...
+    def __setitem__(self, __key: slice, __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.
--- a/stdlib/datetime.pyi
+++ b/stdlib/datetime.pyi
@@ -82,29 +82,29 @@ class date:
    def timetuple(self) -> struct_time: ...
    def toordinal(self) -> int: ...
    def replace(self, year: int = ..., month: int = ..., day: int = ...) -> Self: ...
-    def __le__(self, __other: date) -> bool: ...
-    def __lt__(self, __other: date) -> bool: ...
-    def __ge__(self, __other: date) -> bool: ...
-    def __gt__(self, __other: date) -> bool: ...
+    def __le__(self, __value: date) -> bool: ...
+    def __lt__(self, __value: date) -> bool: ...
+    def __ge__(self, __value: date) -> bool: ...
+    def __gt__(self, __value: date) -> bool: ...
    if sys.version_info >= (3, 8):
-        def __add__(self, __other: timedelta) -> Self: ...
-        def __radd__(self, __other: timedelta) -> Self: ...
+        def __add__(self, __value: timedelta) -> Self: ...
+        def __radd__(self, __value: timedelta) -> Self: ...
        @overload
-        def __sub__(self, __other: timedelta) -> Self: ...
+        def __sub__(self, __value: timedelta) -> Self: ...
        @overload
-        def __sub__(self, __other: datetime) -> NoReturn: ...
+        def __sub__(self, __value: datetime) -> NoReturn: ...
        @overload
-        def __sub__(self: _D, __other: _D) -> timedelta: ...
+        def __sub__(self: _D, __value: _D) -> timedelta: ...
    else:
        # Prior to Python 3.8, arithmetic operations always returned `date`, even in subclasses
-        def __add__(self, __other: timedelta) -> date: ...
-        def __radd__(self, __other: timedelta) -> date: ...
+        def __add__(self, __value: timedelta) -> date: ...
+        def __radd__(self, __value: timedelta) -> date: ...
        @overload
-        def __sub__(self, __other: timedelta) -> date: ...
+        def __sub__(self, __value: timedelta) -> date: ...
        @overload
-        def __sub__(self, __other: datetime) -> NoReturn: ...
+        def __sub__(self, __value: datetime) -> NoReturn: ...
        @overload
-        def __sub__(self, __other: date) -> timedelta: ...
+        def __sub__(self, __value: date) -> timedelta: ...

    def weekday(self) -> int: ...
    def isoweekday(self) -> int: ...
@@ -139,10 +139,10 @@ class time:
    def tzinfo(self) -> _TzInfo | None: ...
    @property
    def fold(self) -> int: ...
-    def __le__(self, __other: time) -> bool: ...
-    def __lt__(self, __other: time) -> bool: ...
-    def __ge__(self, __other: time) -> bool: ...
-    def __gt__(self, __other: time) -> bool: ...
+    def __le__(self, __value: time) -> bool: ...
+    def __lt__(self, __value: time) -> bool: ...
+    def __ge__(self, __value: time) -> bool: ...
+    def __gt__(self, __value: time) -> bool: ...
    def isoformat(self, timespec: str = ...) -> str: ...
    @classmethod
    def fromisoformat(cls, __time_string: str) -> Self: ...
@@ -193,29 +193,29 @@ class timedelta:
    @property
    def microseconds(self) -> int: ...
    def total_seconds(self) -> float: ...
-    def __add__(self, __other: timedelta) -> timedelta: ...
-    def __radd__(self, __other: timedelta) -> timedelta: ...
-    def __sub__(self, __other: timedelta) -> timedelta: ...
-    def __rsub__(self, __other: timedelta) -> timedelta: ...
+    def __add__(self, __value: timedelta) -> timedelta: ...
+    def __radd__(self, __value: timedelta) -> timedelta: ...
+    def __sub__(self, __value: timedelta) -> timedelta: ...
+    def __rsub__(self, __value: timedelta) -> timedelta: ...
    def __neg__(self) -> timedelta: ...
    def __pos__(self) -> timedelta: ...
    def __abs__(self) -> timedelta: ...
-    def __mul__(self, __other: float) -> timedelta: ...
-    def __rmul__(self, __other: float) -> timedelta: ...
+    def __mul__(self, __value: float) -> timedelta: ...
+    def __rmul__(self, __value: float) -> timedelta: ...
    @overload
-    def __floordiv__(self, __other: timedelta) -> int: ...
+    def __floordiv__(self, __value: timedelta) -> int: ...
    @overload
-    def __floordiv__(self, __other: int) -> timedelta: ...
+    def __floordiv__(self, __value: int) -> timedelta: ...
    @overload
-    def __truediv__(self, __other: timedelta) -> float: ...
+    def __truediv__(self, __value: timedelta) -> float: ...
    @overload
-    def __truediv__(self, __other: float) -> timedelta: ...
-    def __mod__(self, __other: timedelta) -> timedelta: ...
-    def __divmod__(self, __other: timedelta) -> tuple[int, timedelta]: ...
-    def __le__(self, __other: timedelta) -> bool: ...
-    def __lt__(self, __other: timedelta) -> bool: ...
-    def __ge__(self, __other: timedelta) -> bool: ...
-    def __gt__(self, __other: timedelta) -> bool: ...
+    def __truediv__(self, __value: float) -> timedelta: ...
+    def __mod__(self, __value: timedelta) -> timedelta: ...
+    def __divmod__(self, __value: timedelta) -> tuple[int, timedelta]: ...
+    def __le__(self, __value: timedelta) -> bool: ...
+    def __lt__(self, __value: timedelta) -> bool: ...
+    def __ge__(self, __value: timedelta) -> bool: ...
+    def __gt__(self, __value: timedelta) -> bool: ...
    def __bool__(self) -> bool: ...

 class datetime(date):
@@ -302,20 +302,20 @@ class datetime(date):
    def utcoffset(self) -> timedelta | None: ...
    def tzname(self) -> str | None: ...
    def dst(self) -> timedelta | None: ...
-    def __le__(self, __other: datetime) -> bool: ...  # type: ignore[override]
-    def __lt__(self, __other: datetime) -> bool: ...  # type: ignore[override]
-    def __ge__(self, __other: datetime) -> bool: ...  # type: ignore[override]
-    def __gt__(self, __other: datetime) -> bool: ...  # type: ignore[override]
+    def __le__(self, __value: datetime) -> bool: ...  # type: ignore[override]
+    def __lt__(self, __value: datetime) -> bool: ...  # type: ignore[override]
+    def __ge__(self, __value: datetime) -> bool: ...  # type: ignore[override]
+    def __gt__(self, __value: datetime) -> bool: ...  # type: ignore[override]
    if sys.version_info >= (3, 8):
        @overload  # type: ignore[override]
-        def __sub__(self, __other: timedelta) -> Self: ...
+        def __sub__(self, __value: timedelta) -> Self: ...
        @overload
-        def __sub__(self: _D, __other: _D) -> timedelta: ...
+        def __sub__(self: _D, __value: _D) -> timedelta: ...
    else:
        # Prior to Python 3.8, arithmetic operations always returned `datetime`, even in subclasses
-        def __add__(self, __other: timedelta) -> datetime: ...
-        def __radd__(self, __other: timedelta) -> datetime: ...
+        def __add__(self, __value: timedelta) -> datetime: ...
+        def __radd__(self, __value: timedelta) -> datetime: ...
        @overload  # type: ignore[override]
-        def __sub__(self, __other: datetime) -> timedelta: ...
+        def __sub__(self, __value: datetime) -> timedelta: ...
        @overload
-        def __sub__(self, __other: timedelta) -> datetime: ...
+        def __sub__(self, __value: timedelta) -> datetime: ...
--- a/stdlib/email/charset.pyi
+++ b/stdlib/email/charset.pyi
@@ -20,7 +20,7 @@ class Charset:
    def header_encode_lines(self, string: str, maxlengths: Iterator[int]) -> list[str]: ...
    def body_encode(self, string: str) -> str: ...
    def __eq__(self, other: object) -> bool: ...
-    def __ne__(self, __other: object) -> bool: ...
+    def __ne__(self, __value: object) -> bool: ...

 def add_charset(
    charset: str, header_enc: int | None = None, body_enc: int | None = None, output_charset: str | None = None
--- a/stdlib/email/header.pyi
+++ b/stdlib/email/header.pyi
@@ -17,7 +17,7 @@ class Header:
    def append(self, s: bytes | bytearray | str, charset: Charset | str | None = None, errors: str = "strict") -> None: ...
    def encode(self, splitchars: str = ";, \t", maxlinelen: int | None = None, linesep: str = "\n") -> str: ...
    def __eq__(self, other: object) -> bool: ...
-    def __ne__(self, __other: object) -> bool: ...
+    def __ne__(self, __value: object) -> bool: ...

 # decode_header() either returns list[tuple[str, None]] if the header
 # contains no encoded parts, or list[tuple[bytes, str | None]] if the header
--- a/stdlib/enum.pyi
+++ b/stdlib/enum.pyi
@@ -106,7 +106,15 @@ class EnumMeta(ABCMeta):

    def __iter__(self: type[_EnumMemberT]) -> Iterator[_EnumMemberT]: ...
    def __reversed__(self: type[_EnumMemberT]) -> Iterator[_EnumMemberT]: ...
-    def __contains__(self: type[Any], obj: object) -> bool: ...
+    if sys.version_info >= (3, 12):
+        def __contains__(self: type[Any], value: object) -> bool: ...
+    elif sys.version_info >= (3, 11):
+        def __contains__(self: type[Any], member: object) -> bool: ...
+    elif sys.version_info >= (3, 10):
+        def __contains__(self: type[Any], obj: object) -> bool: ...
+    else:
+        def __contains__(self: type[Any], member: object) -> bool: ...
+
    def __getitem__(self: type[_EnumMemberT], name: str) -> _EnumMemberT: ...
    @_builtins_property
    def __members__(self: type[_EnumMemberT]) -> types.MappingProxyType[str, _EnumMemberT]: ...
--- a/stdlib/fractions.pyi
+++ b/stdlib/fractions.pyi
@@ -103,14 +103,25 @@ class Fraction(Rational):
    def __rmod__(b, a: int | Fraction) -> Fraction: ...
    @overload
    def __rmod__(b, a: float) -> float: ...
-    @overload
-    def __divmod__(a, b: int | Fraction) -> tuple[int, Fraction]: ...
-    @overload
-    def __divmod__(a, b: float) -> tuple[float, Fraction]: ...
-    @overload
-    def __rdivmod__(b, a: int | Fraction) -> tuple[int, Fraction]: ...
-    @overload
-    def __rdivmod__(b, a: float) -> tuple[float, Fraction]: ...
+    if sys.version_info >= (3, 8):
+        @overload
+        def __divmod__(a, b: int | Fraction) -> tuple[int, Fraction]: ...
+        @overload
+        def __divmod__(a, b: float) -> tuple[float, Fraction]: ...
+        @overload
+        def __rdivmod__(a, b: int | Fraction) -> tuple[int, Fraction]: ...
+        @overload
+        def __rdivmod__(a, b: float) -> tuple[float, Fraction]: ...
+    else:
+        @overload
+        def __divmod__(self, other: int | Fraction) -> tuple[int, Fraction]: ...
+        @overload
+        def __divmod__(self, other: float) -> tuple[float, Fraction]: ...
+        @overload
+        def __rdivmod__(self, other: int | Fraction) -> tuple[int, Fraction]: ...
+        @overload
+        def __rdivmod__(self, other: float) -> tuple[float, Fraction]: ...
+
    @overload
    def __pow__(a, b: int) -> Fraction: ...
    @overload
--- a/stdlib/heapq.pyi
+++ b/stdlib/heapq.pyi
@@ -15,4 +15,4 @@ def merge(
 ) -> Iterable[_S]: ...
 def nlargest(n: int, iterable: Iterable[_S], key: Callable[[_S], SupportsRichComparison] | None = None) -> list[_S]: ...
 def nsmallest(n: int, iterable: Iterable[_S], key: Callable[[_S], SupportsRichComparison] | None = None) -> list[_S]: ...
-def _heapify_max(__x: list[Any]) -> None: ...  # undocumented
+def _heapify_max(__heap: list[Any]) -> None: ...  # undocumented
--- a/stdlib/ipaddress.pyi
+++ b/stdlib/ipaddress.pyi
@@ -36,7 +36,9 @@ class _BaseAddress(_IPAddressBase, SupportsInt):
    def __add__(self, other: int) -> Self: ...
    def __int__(self) -> int: ...
    def __sub__(self, other: int) -> Self: ...
-    def __format__(self, fmt: str) -> str: ...
+    if sys.version_info >= (3, 9):
+        def __format__(self, fmt: str) -> str: ...
+
    def __eq__(self, other: object) -> bool: ...
    def __lt__(self, other: Self) -> bool: ...
    if sys.version_info >= (3, 11):
--- a/stdlib/mmap.pyi
+++ b/stdlib/mmap.pyi
@@ -60,14 +60,14 @@ class mmap(Iterable[int], Sized):
    def read(self, n: int | None = ...) -> bytes: ...
    def write(self, bytes: ReadableBuffer) -> int: ...
    @overload
-    def __getitem__(self, __index: int) -> int: ...
+    def __getitem__(self, __key: int) -> int: ...
    @overload
-    def __getitem__(self, __index: slice) -> bytes: ...
-    def __delitem__(self, __index: int | slice) -> NoReturn: ...
+    def __getitem__(self, __key: slice) -> bytes: ...
+    def __delitem__(self, __key: int | slice) -> NoReturn: ...
    @overload
-    def __setitem__(self, __index: int, __object: int) -> None: ...
+    def __setitem__(self, __key: int, __value: int) -> None: ...
    @overload
-    def __setitem__(self, __index: slice, __object: ReadableBuffer) -> None: ...
+    def __setitem__(self, __key: slice, __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: ...
--- a/stdlib/multiprocessing/managers.pyi
+++ b/stdlib/multiprocessing/managers.pyi
@@ -116,8 +116,8 @@ class BaseListProxy(BaseProxy, MutableSequence[_T]):
    def sort(self, *, key: Callable[[_T], SupportsRichComparison], reverse: bool = ...) -> None: ...

 class ListProxy(BaseListProxy[_T]):
-    def __iadd__(self, __x: Iterable[_T]) -> Self: ...  # type: ignore[override]
-    def __imul__(self, __n: SupportsIndex) -> Self: ...  # type: ignore[override]
+    def __iadd__(self, __value: Iterable[_T]) -> Self: ...  # type: ignore[override]
+    def __imul__(self, __value: SupportsIndex) -> Self: ...  # type: ignore[override]

 # Returned by BaseManager.get_server()
 class Server:
--- a/stdlib/multiprocessing/queues.pyi
+++ b/stdlib/multiprocessing/queues.pyi
@@ -15,7 +15,7 @@ class Queue(queue.Queue[_T]):
    def __init__(self, maxsize: int = 0, *, ctx: Any = ...) -> None: ...
    def get(self, block: bool = True, timeout: float | None = None) -> _T: ...
    def put(self, obj: _T, block: bool = True, timeout: float | None = None) -> None: ...
-    def put_nowait(self, item: _T) -> None: ...
+    def put_nowait(self, obj: _T) -> None: ...
    def get_nowait(self) -> _T: ...
    def close(self) -> None: ...
    def join_thread(self) -> None: ...
@@ -30,6 +30,6 @@ class SimpleQueue(Generic[_T]):

    def empty(self) -> bool: ...
    def get(self) -> _T: ...
-    def put(self, item: _T) -> None: ...
+    def put(self, obj: _T) -> None: ...
    if sys.version_info >= (3, 9):
        def __class_getitem__(cls, item: Any) -> GenericAlias: ...
--- a/stdlib/multiprocessing/synchronize.pyi
+++ b/stdlib/multiprocessing/synchronize.pyi
@@ -30,7 +30,7 @@ class Condition(AbstractContextManager[bool]):
    ) -> None: ...

 class Event:
-    def __init__(self, lock: _LockLike | None = ..., *, ctx: BaseContext) -> None: ...
+    def __init__(self, *, ctx: BaseContext) -> None: ...
    def is_set(self) -> bool: ...
    def set(self) -> None: ...
    def clear(self) -> None: ...
--- a/stdlib/os/init.pyi
+++ b/stdlib/os/init.pyi
@@ -885,7 +885,10 @@ def times() -> times_result: ...
 def waitpid(__pid: int, __options: int) -> tuple[int, int]: ...

 if sys.platform == "win32":
-    def startfile(path: StrOrBytesPath, operation: str | None = None) -> None: ...
+    if sys.version_info >= (3, 8):
+        def startfile(path: StrOrBytesPath, operation: str | None = None) -> None: ...
+    else:
+        def startfile(filepath: StrOrBytesPath, operation: str | None = None) -> None: ...

 else:
    def spawnlp(mode: int, file: StrOrBytesPath, arg0: StrOrBytesPath, *args: StrOrBytesPath) -> int: ...
--- a/stdlib/sqlite3/dbapi2.pyi
+++ b/stdlib/sqlite3/dbapi2.pyi
@@ -340,7 +340,7 @@ class Connection:
    def set_trace_callback(self, trace_callback: Callable[[str], object] | None) -> None: ...
    # enable_load_extension and load_extension is not available on python distributions compiled
    # without sqlite3 loadable extension support. see footnotes https://docs.python.org/3/library/sqlite3.html#f1
-    def enable_load_extension(self, __enabled: bool) -> None: ...
+    def enable_load_extension(self, __enable: bool) -> None: ...
    def load_extension(self, __name: str) -> None: ...
    def backup(
        self,
@@ -417,18 +417,18 @@ class Row:
    def __init__(self, __cursor: Cursor, __data: tuple[Any, ...]) -> None: ...
    def keys(self) -> list[str]: ...
    @overload
-    def __getitem__(self, __index: int | str) -> Any: ...
+    def __getitem__(self, __key: int | str) -> Any: ...
    @overload
-    def __getitem__(self, __index: slice) -> tuple[Any, ...]: ...
+    def __getitem__(self, __key: slice) -> tuple[Any, ...]: ...
    def __iter__(self) -> Iterator[Any]: ...
    def __len__(self) -> int: ...
    # These return NotImplemented for anything that is not a Row.
-    def __eq__(self, __other: object) -> bool: ...
-    def __ge__(self, __other: object) -> bool: ...
-    def __gt__(self, __other: object) -> bool: ...
-    def __le__(self, __other: object) -> bool: ...
-    def __lt__(self, __other: object) -> bool: ...
-    def __ne__(self, __other: object) -> bool: ...
+    def __eq__(self, __value: object) -> bool: ...
+    def __ge__(self, __value: object) -> bool: ...
+    def __gt__(self, __value: object) -> bool: ...
+    def __le__(self, __value: object) -> bool: ...
+    def __lt__(self, __value: object) -> bool: ...
+    def __ne__(self, __value: object) -> bool: ...

 if sys.version_info >= (3, 8):
    @final
@@ -453,6 +453,6 @@ if sys.version_info >= (3, 11):
        def seek(self, __offset: int, __origin: int = 0) -> None: ...
        def __len__(self) -> int: ...
        def __enter__(self) -> Self: ...
-        def __exit__(self, __typ: object, __val: object, __tb: object) -> Literal[False]: ...
-        def __getitem__(self, __item: SupportsIndex | slice) -> int: ...
-        def __setitem__(self, __item: SupportsIndex | slice, __value: int) -> None: ...
+        def __exit__(self, __type: object, __val: object, __tb: object) -> Literal[False]: ...
+        def __getitem__(self, __key: SupportsIndex | slice) -> int: ...
+        def __setitem__(self, __key: SupportsIndex | slice, __value: int) -> None: ...
--- a/stdlib/ssl.pyi
+++ b/stdlib/ssl.pyi
@@ -94,8 +94,8 @@ else:

 _create_default_https_context: Callable[..., SSLContext]

-def RAND_bytes(__num: int) -> bytes: ...
-def RAND_pseudo_bytes(__num: int) -> tuple[bytes, bool]: ...
+def RAND_bytes(__n: int) -> bytes: ...
+def RAND_pseudo_bytes(__n: int) -> tuple[bytes, bool]: ...
 def RAND_status() -> bool: ...
 def RAND_egd(path: str) -> None: ...
 def RAND_add(__string: str | ReadableBuffer, __entropy: float) -> None: ...
@@ -470,7 +470,7 @@ class MemoryBIO:
    pending: int
    eof: bool
    def read(self, __size: int = -1) -> bytes: ...
-    def write(self, __buf: ReadableBuffer) -> int: ...
+    def write(self, __b: ReadableBuffer) -> int: ...
    def write_eof(self) -> None: ...

@final
--- a/stdlib/sys.pyi
+++ b/stdlib/sys.pyi
@@ -221,7 +221,7 @@ def _clear_type_cache() -> None: ...
 def _current_frames() -> dict[int, FrameType]: ...
 def _getframe(__depth: int = 0) -> FrameType: ...
 def _debugmallocstats() -> None: ...
-def __displayhook__(__value: object) -> None: ...
+def __displayhook__(__object: object) -> None: ...
 def __excepthook__(__exctype: type[BaseException], __value: BaseException, __traceback: TracebackType | None) -> None: ...
 def exc_info() -> OptExcInfo: ...

--- a/stdlib/types.pyi
+++ b/stdlib/types.pyi
@@ -467,8 +467,8 @@ class MethodWrapperType:
    @property
    def __objclass__(self) -> type: ...
    def __call__(self, *args: Any, **kwargs: Any) -> Any: ...
-    def __eq__(self, __other: object) -> bool: ...
-    def __ne__(self, __other: object) -> bool: ...
+    def __eq__(self, __value: object) -> bool: ...
+    def __ne__(self, __value: object) -> bool: ...

@final
 class MethodDescriptorType:
@@ -538,7 +538,7 @@ class GetSetDescriptorType:
    def __objclass__(self) -> type: ...
    def __get__(self, __instance: Any, __owner: type | None = None) -> Any: ...
    def __set__(self, __instance: Any, __value: Any) -> None: ...
-    def __delete__(self, __obj: Any) -> None: ...
+    def __delete__(self, __instance: Any) -> None: ...

@final
 class MemberDescriptorType:
@@ -550,7 +550,7 @@ class MemberDescriptorType:
    def __objclass__(self) -> type: ...
    def __get__(self, __instance: Any, __owner: type | None = None) -> Any: ...
    def __set__(self, __instance: Any, __value: Any) -> None: ...
-    def __delete__(self, __obj: Any) -> None: ...
+    def __delete__(self, __instance: Any) -> None: ...

 def new_class(
    name: str,
@@ -611,5 +611,5 @@ if sys.version_info >= (3, 10):
    class UnionType:
        @property
        def __args__(self) -> tuple[Any, ...]: ...
-        def __or__(self, __obj: Any) -> UnionType: ...
-        def __ror__(self, __obj: Any) -> UnionType: ...
+        def __or__(self, __value: Any) -> UnionType: ...
+        def __ror__(self, __value: Any) -> UnionType: ...
--- a/stdlib/typing.pyi
+++ b/stdlib/typing.pyi
@@ -593,7 +593,7 @@ class Mapping(Collection[_KT], Generic[_KT, _VT_co]):
    def items(self) -> ItemsView[_KT, _VT_co]: ...
    def keys(self) -> KeysView[_KT]: ...
    def values(self) -> ValuesView[_VT_co]: ...
-    def __contains__(self, __o: object) -> bool: ...
+    def __contains__(self, __key: object) -> bool: ...

 class MutableMapping(Mapping[_KT, _VT], Generic[_KT, _VT]):
    @abstractmethod
@@ -698,7 +698,7 @@ class IO(Iterator[AnyStr], Generic[AnyStr]):
    def __enter__(self) -> IO[AnyStr]: ...
    @abstractmethod
    def __exit__(
-        self, __t: Type[BaseException] | None, __value: BaseException | None, __traceback: TracebackType | None
+        self, __type: Type[BaseException] | None, __value: BaseException | None, __traceback: TracebackType | None
    ) -> None: ...

 class BinaryIO(IO[bytes]):
--- a/stdlib/unittest/case.pyi
+++ b/stdlib/unittest/case.pyi
@@ -48,7 +48,7 @@ else:
        def __init__(self, test_case: TestCase, logger_name: str, level: int) -> None: ...
        def __enter__(self) -> _LoggingWatcher: ...
        def __exit__(
-            self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
+            self, exc_type: type[BaseException] | None, exc_value: BaseException | None, tb: TracebackType | None
        ) -> bool | None: ...

 if sys.version_info >= (3, 8):
--- a/stdlib/unittest/mock.pyi
+++ b/stdlib/unittest/mock.pyi
@@ -81,7 +81,7 @@ class _Call(tuple[Any, ...]):
        from_kall: bool = True,
    ) -> None: ...
    def __eq__(self, other: object) -> bool: ...
-    def __ne__(self, __other: object) -> bool: ...
+    def __ne__(self, __value: object) -> bool: ...
    def __call__(self, *args: Any, **kwargs: Any) -> _Call: ...
    def __getattr__(self, attr: str) -> Any: ...
    def __getattribute__(self, attr: str) -> Any: ...
@@ -437,6 +437,6 @@ class PropertyMock(Mock):
    else:
        def __get__(self, obj: _T, obj_type: type[_T] | None) -> Self: ...

-    def __set__(self, obj: Any, value: Any) -> None: ...
+    def __set__(self, obj: Any, val: Any) -> None: ...

 def seal(mock: Any) -> None: ...
--- a/stdlib/winreg.pyi
+++ b/stdlib/winreg.pyi
@@ -14,7 +14,7 @@ if sys.platform == "win32":
    def DeleteValue(__key: _KeyType, __value: str) -> None: ...
    def EnumKey(__key: _KeyType, __index: int) -> str: ...
    def EnumValue(__key: _KeyType, __index: int) -> tuple[str, Any, int]: ...
-    def ExpandEnvironmentStrings(__str: str) -> str: ...
+    def ExpandEnvironmentStrings(__string: str) -> str: ...
    def FlushKey(__key: _KeyType) -> None: ...
    def LoadKey(__key: _KeyType, __sub_key: str, __file_name: str) -> None: ...
    def OpenKey(key: _KeyType, sub_key: str, reserved: int = 0, access: int = 131097) -> HKEYType: ...
--- a/stdlib/xml/etree/ElementTree.pyi
+++ b/stdlib/xml/etree/ElementTree.pyi
@@ -112,18 +112,18 @@ class Element:
    def set(self, __key: str, __value: str) -> None: ...
    def __copy__(self) -> Element: ...  # returns the type of self in Python impl, but not in C impl
    def __deepcopy__(self, __memo: Any) -> Element: ...  # Only exists in C impl
-    def __delitem__(self, __i: SupportsIndex | slice) -> None: ...
+    def __delitem__(self, __key: SupportsIndex | slice) -> None: ...
    @overload
-    def __getitem__(self, __i: SupportsIndex) -> Element: ...
+    def __getitem__(self, __key: SupportsIndex) -> Element: ...
    @overload
-    def __getitem__(self, __s: slice) -> list[Element]: ...
+    def __getitem__(self, __key: slice) -> 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, __i: SupportsIndex, __o: Element) -> None: ...
+    def __setitem__(self, __key: SupportsIndex, __value: Element) -> None: ...
    @overload
-    def __setitem__(self, __s: slice, __o: Iterable[Element]) -> None: ...
+    def __setitem__(self, __key: slice, __value: Iterable[Element]) -> None: ...
    if sys.version_info < (3, 9):
        def getchildren(self) -> list[Element]: ...
        def getiterator(self, tag: str | None = None) -> list[Element]: ...
--- a/tests/stubtest_allowlists/py3_common.txt
+++ b/tests/stubtest_allowlists/py3_common.txt
@@ -144,13 +144,10 @@ multiprocessing.managers.SyncManager.Namespace
 multiprocessing.managers.SyncManager.RLock
 multiprocessing.queues.JoinableQueue.__init__
 multiprocessing.queues.Queue.__init__
-multiprocessing.queues.Queue.put_nowait
 multiprocessing.queues.SimpleQueue.__init__
-multiprocessing.queues.SimpleQueue.put
 multiprocessing.synchronize.Barrier.__init__
 multiprocessing.synchronize.Condition.acquire
 multiprocessing.synchronize.Condition.release
-multiprocessing.synchronize.Event.__init__
 multiprocessing.synchronize.SemLock.__init__
 multiprocessing.synchronize.SemLock.acquire
 multiprocessing.synchronize.SemLock.release
--- a/tests/stubtest_allowlists/win32-py37.txt
+++ b/tests/stubtest_allowlists/win32-py37.txt
@@ -8,8 +8,6 @@ cgi.parse_multipart
 urllib.parse.parse_qs
 urllib.parse.parse_qsl

-os.startfile
-
 # ==========
 # Allowlist entries that cannot or should not be fixed
 # ==========