From 7c599257ad016e766f22ebcc7e18d057c1446bd0 Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Fri, 7 Oct 2022 01:56:48 +0200
Subject: [PATCH 1/3] Sync typeshed

Source commit:
https://github.com/python/typeshed/commit/8b41b1337b34529f3c328d4167d8c902c36f821f
---
 mypy/typeshed/stdlib/_dummy_threading.pyi     |   3 -
 mypy/typeshed/stdlib/asyncio/taskgroups.pyi   |   1 -
 mypy/typeshed/stdlib/asyncio/tasks.pyi        |  13 +-
 mypy/typeshed/stdlib/asyncio/unix_events.pyi  |   1 -
 mypy/typeshed/stdlib/binhex.pyi               |   1 -
 mypy/typeshed/stdlib/builtins.pyi             | 127 +++++++++++++++---
 mypy/typeshed/stdlib/codeop.pyi               |   2 -
 .../stdlib/concurrent/futures/_base.pyi       |   3 -
 .../stdlib/concurrent/futures/process.pyi     |   1 -
 mypy/typeshed/stdlib/contextlib.pyi           |   2 -
 mypy/typeshed/stdlib/csv.pyi                  |   1 -
 mypy/typeshed/stdlib/dataclasses.pyi          |  11 +-
 mypy/typeshed/stdlib/email/contentmanager.pyi |   1 -
 mypy/typeshed/stdlib/formatter.pyi            |   1 -
 mypy/typeshed/stdlib/importlib/abc.pyi        |  28 ++--
 .../stdlib/importlib/metadata/__init__.pyi    |   3 +
 mypy/typeshed/stdlib/inspect.pyi              |   8 +-
 .../typeshed/stdlib/lib2to3/pgen2/grammar.pyi |   1 -
 mypy/typeshed/stdlib/lib2to3/pgen2/pgen.pyi   |   1 -
 .../stdlib/lib2to3/pgen2/tokenize.pyi         |   1 -
 mypy/typeshed/stdlib/logging/__init__.pyi     |   1 -
 .../stdlib/multiprocessing/forkserver.pyi     |   1 -
 .../stdlib/multiprocessing/managers.pyi       |   4 +-
 .../multiprocessing/resource_tracker.pyi      |   1 -
 mypy/typeshed/stdlib/multiprocessing/util.pyi |   4 +-
 mypy/typeshed/stdlib/pipes.pyi                |   1 -
 mypy/typeshed/stdlib/pydoc.pyi                |   2 -
 mypy/typeshed/stdlib/reprlib.pyi              |   1 -
 mypy/typeshed/stdlib/select.pyi               |   1 -
 mypy/typeshed/stdlib/sre_parse.pyi            |   1 -
 mypy/typeshed/stdlib/string.pyi               |  11 +-
 mypy/typeshed/stdlib/symtable.pyi             |   1 -
 mypy/typeshed/stdlib/threading.pyi            |   3 -
 mypy/typeshed/stdlib/tokenize.pyi             |   1 -
 mypy/typeshed/stdlib/traceback.pyi            |   1 -
 mypy/typeshed/stdlib/typing_extensions.pyi    |  93 +++++++++----
 mypy/typeshed/stdlib/unittest/mock.pyi        |   1 -
 mypy/typeshed/stdlib/xdrlib.pyi               |   1 -
 mypy/typeshed/stdlib/xml/dom/xmlbuilder.pyi   |   1 -
 mypy/typeshed/stdlib/xml/sax/handler.pyi      |   1 -
 mypy/typeshed/stdlib/xml/sax/xmlreader.pyi    |   1 -
 mypy/typeshed/stdlib/xmlrpc/server.pyi        |   1 -
 mypy/typeshed/stdlib/zoneinfo/__init__.pyi    |   2 +-
 43 files changed, 226 insertions(+), 119 deletions(-)

diff --git a/mypy/typeshed/stdlib/_dummy_threading.pyi b/mypy/typeshed/stdlib/_dummy_threading.pyi
index c956946c8363..8f7f5a9b994c 100644
--- a/mypy/typeshed/stdlib/_dummy_threading.pyi
+++ b/mypy/typeshed/stdlib/_dummy_threading.pyi
@@ -86,7 +86,6 @@ class Thread:
 class _DummyThread(Thread): ...
 
 class Lock:
-    def __init__(self) -> None: ...
     def __enter__(self) -> bool: ...
     def __exit__(
         self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
@@ -96,7 +95,6 @@ class Lock:
     def locked(self) -> bool: ...
 
 class _RLock:
-    def __init__(self) -> None: ...
     def __enter__(self) -> bool: ...
     def __exit__(
         self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
@@ -135,7 +133,6 @@ class Semaphore:
 class BoundedSemaphore(Semaphore): ...
 
 class Event:
-    def __init__(self) -> None: ...
     def is_set(self) -> bool: ...
     def set(self) -> None: ...
     def clear(self) -> None: ...
diff --git a/mypy/typeshed/stdlib/asyncio/taskgroups.pyi b/mypy/typeshed/stdlib/asyncio/taskgroups.pyi
index 9b2f15506c50..0d508c97c1f9 100644
--- a/mypy/typeshed/stdlib/asyncio/taskgroups.pyi
+++ b/mypy/typeshed/stdlib/asyncio/taskgroups.pyi
@@ -13,7 +13,6 @@ __all__ = ["TaskGroup"]
 _T = TypeVar("_T")
 
 class TaskGroup:
-    def __init__(self) -> None: ...
     async def __aenter__(self: Self) -> Self: ...
     async def __aexit__(self, et: type[BaseException] | None, exc: BaseException | None, tb: TracebackType | None) -> None: ...
     def create_task(
diff --git a/mypy/typeshed/stdlib/asyncio/tasks.pyi b/mypy/typeshed/stdlib/asyncio/tasks.pyi
index 76755f1109c3..27d80be8d8f5 100644
--- a/mypy/typeshed/stdlib/asyncio/tasks.pyi
+++ b/mypy/typeshed/stdlib/asyncio/tasks.pyi
@@ -36,6 +36,7 @@ __all__ = (
 )
 
 _T = TypeVar("_T")
+_T_co = TypeVar("_T_co", covariant=True)
 _T1 = TypeVar("_T1")
 _T2 = TypeVar("_T2")
 _T3 = TypeVar("_T3")
@@ -265,21 +266,25 @@ else:
     ) -> tuple[set[Task[_T]], set[Task[_T]]]: ...
     async def wait_for(fut: _FutureLike[_T], timeout: float | None, *, loop: AbstractEventLoop | None = ...) -> _T: ...
 
-class Task(Future[_T], Generic[_T]):
+# pyright complains that a subclass of an invariant class shouldn't be covariant.
+# While this is true in general, here it's sort-of okay to have a covariant subclass,
+# since the only reason why `asyncio.Future` is invariant is the `set_result()` method,
+# and `asyncio.Task.set_result()` always raises.
+class Task(Future[_T_co], Generic[_T_co]):  # pyright: ignore[reportGeneralTypeIssues]
     if sys.version_info >= (3, 8):
         def __init__(
             self,
-            coro: Generator[_TaskYieldType, None, _T] | Awaitable[_T],
+            coro: Generator[_TaskYieldType, None, _T_co] | Awaitable[_T_co],
             *,
             loop: AbstractEventLoop = ...,
             name: str | None = ...,
         ) -> None: ...
     else:
         def __init__(
-            self, coro: Generator[_TaskYieldType, None, _T] | Awaitable[_T], *, loop: AbstractEventLoop = ...
+            self, coro: Generator[_TaskYieldType, None, _T_co] | Awaitable[_T_co], *, loop: AbstractEventLoop = ...
         ) -> None: ...
     if sys.version_info >= (3, 8):
-        def get_coro(self) -> Generator[_TaskYieldType, None, _T] | Awaitable[_T]: ...
+        def get_coro(self) -> Generator[_TaskYieldType, None, _T_co] | Awaitable[_T_co]: ...
         def get_name(self) -> str: ...
         def set_name(self, __value: object) -> None: ...
 
diff --git a/mypy/typeshed/stdlib/asyncio/unix_events.pyi b/mypy/typeshed/stdlib/asyncio/unix_events.pyi
index f63011a373be..19dd3ca43b95 100644
--- a/mypy/typeshed/stdlib/asyncio/unix_events.pyi
+++ b/mypy/typeshed/stdlib/asyncio/unix_events.pyi
@@ -118,7 +118,6 @@ if sys.platform != "win32":
 
     if sys.version_info >= (3, 9):
         class PidfdChildWatcher(AbstractChildWatcher):
-            def __init__(self) -> None: ...
             def __enter__(self: Self) -> Self: ...
             def __exit__(
                 self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: types.TracebackType | None
diff --git a/mypy/typeshed/stdlib/binhex.pyi b/mypy/typeshed/stdlib/binhex.pyi
index 27aa379f134d..639d30d1d0de 100644
--- a/mypy/typeshed/stdlib/binhex.pyi
+++ b/mypy/typeshed/stdlib/binhex.pyi
@@ -10,7 +10,6 @@ LINELEN: Literal[64]
 RUNCHAR: Literal[b"\x90"]
 
 class FInfo:
-    def __init__(self) -> None: ...
     Type: str
     Creator: str
     Flags: int
diff --git a/mypy/typeshed/stdlib/builtins.pyi b/mypy/typeshed/stdlib/builtins.pyi
index 23e8649cb686..baa7f15a7346 100644
--- a/mypy/typeshed/stdlib/builtins.pyi
+++ b/mypy/typeshed/stdlib/builtins.pyi
@@ -55,7 +55,7 @@ from typing import (  # noqa: Y027
     overload,
     type_check_only,
 )
-from typing_extensions import Literal, SupportsIndex, TypeAlias, TypeGuard, final
+from typing_extensions import Literal, LiteralString, SupportsIndex, TypeAlias, TypeGuard, final
 
 if sys.version_info >= (3, 9):
     from types import GenericAlias
@@ -414,8 +414,17 @@ class str(Sequence[str]):
     def __new__(cls: type[Self], object: object = ...) -> Self: ...
     @overload
     def __new__(cls: type[Self], object: ReadableBuffer, encoding: str = ..., errors: str = ...) -> Self: ...
+    @overload
+    def capitalize(self: LiteralString) -> LiteralString: ...
+    @overload
     def capitalize(self) -> str: ...  # type: ignore[misc]
+    @overload
+    def casefold(self: LiteralString) -> LiteralString: ...
+    @overload
     def casefold(self) -> str: ...  # type: ignore[misc]
+    @overload
+    def center(self: LiteralString, __width: SupportsIndex, __fillchar: LiteralString = ...) -> LiteralString: ...
+    @overload
     def center(self, __width: SupportsIndex, __fillchar: str = ...) -> str: ...  # type: ignore[misc]
     def count(self, x: str, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...) -> int: ...
     def encode(self, encoding: str = ..., errors: str = ...) -> bytes: ...
@@ -423,11 +432,20 @@ class str(Sequence[str]):
         self, __suffix: str | tuple[str, ...], __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...
     ) -> bool: ...
     if sys.version_info >= (3, 8):
+        @overload
+        def expandtabs(self: LiteralString, tabsize: SupportsIndex = ...) -> LiteralString: ...
+        @overload
         def expandtabs(self, tabsize: SupportsIndex = ...) -> str: ...  # type: ignore[misc]
     else:
+        @overload
+        def expandtabs(self: LiteralString, tabsize: int = ...) -> LiteralString: ...
+        @overload
         def expandtabs(self, tabsize: int = ...) -> str: ...  # type: ignore[misc]
 
     def find(self, __sub: str, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...) -> int: ...
+    @overload
+    def format(self: LiteralString, *args: LiteralString, **kwargs: LiteralString) -> LiteralString: ...
+    @overload
     def format(self, *args: object, **kwargs: object) -> str: ...  # type: ignore[misc]
     def format_map(self, map: _FormatMapMapping) -> str: ...
     def index(self, __sub: str, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...) -> int: ...
@@ -443,32 +461,91 @@ class str(Sequence[str]):
     def isspace(self) -> bool: ...
     def istitle(self) -> bool: ...
     def isupper(self) -> bool: ...
+    @overload
+    def join(self: LiteralString, __iterable: Iterable[LiteralString]) -> LiteralString: ...
+    @overload
     def join(self, __iterable: Iterable[str]) -> str: ...  # type: ignore[misc]
+    @overload
+    def ljust(self: LiteralString, __width: SupportsIndex, __fillchar: LiteralString = ...) -> LiteralString: ...
+    @overload
     def ljust(self, __width: SupportsIndex, __fillchar: str = ...) -> str: ...  # type: ignore[misc]
+    @overload
+    def lower(self: LiteralString) -> LiteralString: ...
+    @overload
     def lower(self) -> str: ...  # type: ignore[misc]
+    @overload
+    def lstrip(self: LiteralString, __chars: LiteralString | None = ...) -> LiteralString: ...
+    @overload
     def lstrip(self, __chars: str | None = ...) -> str: ...  # type: ignore[misc]
+    @overload
+    def partition(self: LiteralString, __sep: LiteralString) -> tuple[LiteralString, LiteralString, LiteralString]: ...
+    @overload
     def partition(self, __sep: str) -> tuple[str, str, str]: ...  # type: ignore[misc]
+    @overload
+    def replace(
+        self: LiteralString, __old: LiteralString, __new: LiteralString, __count: SupportsIndex = ...
+    ) -> LiteralString: ...
+    @overload
     def replace(self, __old: str, __new: str, __count: SupportsIndex = ...) -> str: ...  # type: ignore[misc]
     if sys.version_info >= (3, 9):
+        @overload
+        def removeprefix(self: LiteralString, __prefix: LiteralString) -> LiteralString: ...
+        @overload
         def removeprefix(self, __prefix: str) -> str: ...  # type: ignore[misc]
+        @overload
+        def removesuffix(self: LiteralString, __suffix: LiteralString) -> LiteralString: ...
+        @overload
         def removesuffix(self, __suffix: str) -> str: ...  # type: ignore[misc]
 
     def rfind(self, __sub: str, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...) -> int: ...
     def rindex(self, __sub: str, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...) -> int: ...
+    @overload
+    def rjust(self: LiteralString, __width: SupportsIndex, __fillchar: LiteralString = ...) -> LiteralString: ...
+    @overload
     def rjust(self, __width: SupportsIndex, __fillchar: str = ...) -> str: ...  # type: ignore[misc]
+    @overload
+    def rpartition(self: LiteralString, __sep: LiteralString) -> tuple[LiteralString, LiteralString, LiteralString]: ...
+    @overload
     def rpartition(self, __sep: str) -> tuple[str, str, str]: ...  # type: ignore[misc]
+    @overload
+    def rsplit(self: LiteralString, sep: LiteralString | None = ..., maxsplit: SupportsIndex = ...) -> list[LiteralString]: ...
+    @overload
     def rsplit(self, sep: str | None = ..., maxsplit: SupportsIndex = ...) -> list[str]: ...  # type: ignore[misc]
+    @overload
+    def rstrip(self: LiteralString, __chars: LiteralString | None = ...) -> LiteralString: ...
+    @overload
     def rstrip(self, __chars: str | None = ...) -> str: ...  # type: ignore[misc]
+    @overload
+    def split(self: LiteralString, sep: LiteralString | None = ..., maxsplit: SupportsIndex = ...) -> list[LiteralString]: ...
+    @overload
     def split(self, sep: str | None = ..., maxsplit: SupportsIndex = ...) -> list[str]: ...  # type: ignore[misc]
+    @overload
+    def splitlines(self: LiteralString, keepends: bool = ...) -> list[LiteralString]: ...
+    @overload
     def splitlines(self, keepends: bool = ...) -> list[str]: ...  # type: ignore[misc]
     def startswith(
         self, __prefix: str | tuple[str, ...], __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...
     ) -> bool: ...
+    @overload
+    def strip(self: LiteralString, __chars: LiteralString | None = ...) -> LiteralString: ...
+    @overload
     def strip(self, __chars: str | None = ...) -> str: ...  # type: ignore[misc]
+    @overload
+    def swapcase(self: LiteralString) -> LiteralString: ...
+    @overload
     def swapcase(self) -> str: ...  # type: ignore[misc]
+    @overload
+    def title(self: LiteralString) -> LiteralString: ...
+    @overload
     def title(self) -> str: ...  # type: ignore[misc]
     def translate(self, __table: _TranslateTable) -> str: ...
+    @overload
+    def upper(self: LiteralString) -> LiteralString: ...
+    @overload
     def upper(self) -> str: ...  # type: ignore[misc]
+    @overload
+    def zfill(self: LiteralString, __width: SupportsIndex) -> LiteralString: ...
+    @overload
     def zfill(self, __width: SupportsIndex) -> str: ...  # type: ignore[misc]
     @staticmethod
     @overload
@@ -476,6 +553,9 @@ class str(Sequence[str]):
     @staticmethod
     @overload
     def maketrans(__x: str, __y: str, __z: str | None = ...) -> dict[int, int | None]: ...
+    @overload
+    def __add__(self: LiteralString, __s: LiteralString) -> LiteralString: ...
+    @overload
     def __add__(self, __s: str) -> str: ...  # type: ignore[misc]
     # Incompatible with Sequence.__contains__
     def __contains__(self, __o: str) -> bool: ...  # type: ignore[override]
@@ -483,13 +563,25 @@ class str(Sequence[str]):
     def __ge__(self, __x: str) -> bool: ...
     def __getitem__(self, __i: SupportsIndex | slice) -> str: ...
     def __gt__(self, __x: 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 __len__(self) -> int: ...
     def __lt__(self, __x: str) -> bool: ...
+    @overload
+    def __mod__(self: LiteralString, __x: LiteralString | tuple[LiteralString, ...]) -> LiteralString: ...
+    @overload
     def __mod__(self, __x: Any) -> str: ...  # type: ignore[misc]
+    @overload
+    def __mul__(self: LiteralString, __n: SupportsIndex) -> LiteralString: ...
+    @overload
     def __mul__(self, __n: SupportsIndex) -> str: ...  # type: ignore[misc]
     def __ne__(self, __x: object) -> bool: ...
+    @overload
+    def __rmul__(self: LiteralString, __n: SupportsIndex) -> LiteralString: ...
+    @overload
     def __rmul__(self, __n: SupportsIndex) -> str: ...  # type: ignore[misc]
     def __getnewargs__(self) -> tuple[str]: ...
 
@@ -1712,8 +1804,6 @@ class Exception(BaseException): ...
 class StopIteration(Exception):
     value: Any
 
-_StandardError = Exception
-
 class OSError(Exception):
     errno: int
     strerror: str
@@ -1728,37 +1818,38 @@ IOError = OSError
 if sys.platform == "win32":
     WindowsError = OSError
 
-class ArithmeticError(_StandardError): ...
-class AssertionError(_StandardError): ...
+class ArithmeticError(Exception): ...
+class AssertionError(Exception): ...
 
-class AttributeError(_StandardError):
+class AttributeError(Exception):
     if sys.version_info >= (3, 10):
+        def __init__(self, *args: object, name: str | None = ..., obj: object = ...) -> None: ...
         name: str
         obj: object
 
-class BufferError(_StandardError): ...
-class EOFError(_StandardError): ...
+class BufferError(Exception): ...
+class EOFError(Exception): ...
 
-class ImportError(_StandardError):
+class ImportError(Exception):
     def __init__(self, *args: object, name: str | None = ..., path: str | None = ...) -> None: ...
     name: str | None
     path: str | None
     msg: str  # undocumented
 
-class LookupError(_StandardError): ...
-class MemoryError(_StandardError): ...
+class LookupError(Exception): ...
+class MemoryError(Exception): ...
 
-class NameError(_StandardError):
+class NameError(Exception):
     if sys.version_info >= (3, 10):
         name: str
 
-class ReferenceError(_StandardError): ...
-class RuntimeError(_StandardError): ...
+class ReferenceError(Exception): ...
+class RuntimeError(Exception): ...
 
 class StopAsyncIteration(Exception):
     value: Any
 
-class SyntaxError(_StandardError):
+class SyntaxError(Exception):
     msg: str
     lineno: int | None
     offset: int | None
@@ -1768,9 +1859,9 @@ class SyntaxError(_StandardError):
         end_lineno: int | None
         end_offset: int | None
 
-class SystemError(_StandardError): ...
-class TypeError(_StandardError): ...
-class ValueError(_StandardError): ...
+class SystemError(Exception): ...
+class TypeError(Exception): ...
+class ValueError(Exception): ...
 class FloatingPointError(ArithmeticError): ...
 class OverflowError(ArithmeticError): ...
 class ZeroDivisionError(ArithmeticError): ...
diff --git a/mypy/typeshed/stdlib/codeop.pyi b/mypy/typeshed/stdlib/codeop.pyi
index 1c00e13fd501..36af1d297548 100644
--- a/mypy/typeshed/stdlib/codeop.pyi
+++ b/mypy/typeshed/stdlib/codeop.pyi
@@ -6,10 +6,8 @@ def compile_command(source: str, filename: str = ..., symbol: str = ...) -> Code
 
 class Compile:
     flags: int
-    def __init__(self) -> None: ...
     def __call__(self, source: str, filename: str, symbol: str) -> CodeType: ...
 
 class CommandCompiler:
     compiler: Compile
-    def __init__(self) -> None: ...
     def __call__(self, source: str, filename: str = ..., symbol: str = ...) -> CodeType | None: ...
diff --git a/mypy/typeshed/stdlib/concurrent/futures/_base.pyi b/mypy/typeshed/stdlib/concurrent/futures/_base.pyi
index 897bdb71eaed..3db968878498 100644
--- a/mypy/typeshed/stdlib/concurrent/futures/_base.pyi
+++ b/mypy/typeshed/stdlib/concurrent/futures/_base.pyi
@@ -35,7 +35,6 @@ _T = TypeVar("_T")
 _P = ParamSpec("_P")
 
 class Future(Generic[_T]):
-    def __init__(self) -> None: ...
     def cancel(self) -> bool: ...
     def cancelled(self) -> bool: ...
     def running(self) -> bool: ...
@@ -90,14 +89,12 @@ def wait(fs: Iterable[Future[_T]], timeout: float | None = ..., return_when: str
 class _Waiter:
     event: threading.Event
     finished_futures: list[Future[Any]]
-    def __init__(self) -> None: ...
     def add_result(self, future: Future[Any]) -> None: ...
     def add_exception(self, future: Future[Any]) -> None: ...
     def add_cancelled(self, future: Future[Any]) -> None: ...
 
 class _AsCompletedWaiter(_Waiter):
     lock: threading.Lock
-    def __init__(self) -> None: ...
 
 class _FirstCompletedWaiter(_Waiter): ...
 
diff --git a/mypy/typeshed/stdlib/concurrent/futures/process.pyi b/mypy/typeshed/stdlib/concurrent/futures/process.pyi
index 211107cf357d..a98702d095a2 100644
--- a/mypy/typeshed/stdlib/concurrent/futures/process.pyi
+++ b/mypy/typeshed/stdlib/concurrent/futures/process.pyi
@@ -19,7 +19,6 @@ class _ThreadWakeup:
     _closed: bool
     _reader: Connection
     _writer: Connection
-    def __init__(self) -> None: ...
     def close(self) -> None: ...
     def wakeup(self) -> None: ...
     def clear(self) -> None: ...
diff --git a/mypy/typeshed/stdlib/contextlib.pyi b/mypy/typeshed/stdlib/contextlib.pyi
index 00aa7c5ef1d3..ca8830439538 100644
--- a/mypy/typeshed/stdlib/contextlib.pyi
+++ b/mypy/typeshed/stdlib/contextlib.pyi
@@ -137,7 +137,6 @@ class redirect_stderr(_RedirectStream[_T_io]): ...
 # In reality this is a subclass of `AbstractContextManager`;
 # see #7961 for why we don't do that in the stub
 class ExitStack(metaclass=abc.ABCMeta):
-    def __init__(self) -> None: ...
     def enter_context(self, cm: AbstractContextManager[_T]) -> _T: ...
     def push(self, exit: _CM_EF) -> _CM_EF: ...
     def callback(self, __callback: Callable[_P, _T], *args: _P.args, **kwds: _P.kwargs) -> Callable[_P, _T]: ...
@@ -156,7 +155,6 @@ _ACM_EF = TypeVar("_ACM_EF", bound=AbstractAsyncContextManager[Any] | _ExitCoroF
 # In reality this is a subclass of `AbstractAsyncContextManager`;
 # see #7961 for why we don't do that in the stub
 class AsyncExitStack(metaclass=abc.ABCMeta):
-    def __init__(self) -> None: ...
     def enter_context(self, cm: AbstractContextManager[_T]) -> _T: ...
     async def enter_async_context(self, cm: AbstractAsyncContextManager[_T]) -> _T: ...
     def push(self, exit: _CM_EF) -> _CM_EF: ...
diff --git a/mypy/typeshed/stdlib/csv.pyi b/mypy/typeshed/stdlib/csv.pyi
index 73067c6803d4..8802d6b0a5f5 100644
--- a/mypy/typeshed/stdlib/csv.pyi
+++ b/mypy/typeshed/stdlib/csv.pyi
@@ -146,6 +146,5 @@ class DictWriter(Generic[_T]):
 
 class Sniffer:
     preferred: list[str]
-    def __init__(self) -> None: ...
     def sniff(self, sample: str, delimiters: str | None = ...) -> type[Dialect]: ...
     def has_header(self, sample: str) -> bool: ...
diff --git a/mypy/typeshed/stdlib/dataclasses.pyi b/mypy/typeshed/stdlib/dataclasses.pyi
index 04ae771fc064..560147f9e96b 100644
--- a/mypy/typeshed/stdlib/dataclasses.pyi
+++ b/mypy/typeshed/stdlib/dataclasses.pyi
@@ -4,7 +4,7 @@ import types
 from builtins import type as Type  # alias to avoid name clashes with fields named "type"
 from collections.abc import Callable, Iterable, Mapping
 from typing import Any, Generic, Protocol, TypeVar, overload
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 if sys.version_info >= (3, 9):
     from types import GenericAlias
@@ -217,7 +217,14 @@ def is_dataclass(obj: Any) -> bool: ...
 
 class FrozenInstanceError(AttributeError): ...
 
-class InitVar(Generic[_T]):
+if sys.version_info >= (3, 9):
+    _InitVarMeta: TypeAlias = type
+else:
+    class _InitVarMeta(type):
+        # Not used, instead `InitVar.__class_getitem__` is called.
+        def __getitem__(self, params: Any) -> InitVar[Any]: ...
+
+class InitVar(Generic[_T], metaclass=_InitVarMeta):
     type: Type[_T]
     def __init__(self, type: Type[_T]) -> None: ...
     if sys.version_info >= (3, 9):
diff --git a/mypy/typeshed/stdlib/email/contentmanager.pyi b/mypy/typeshed/stdlib/email/contentmanager.pyi
index 3ac665eaa7bf..3214f1a4781d 100644
--- a/mypy/typeshed/stdlib/email/contentmanager.pyi
+++ b/mypy/typeshed/stdlib/email/contentmanager.pyi
@@ -3,7 +3,6 @@ from email.message import Message
 from typing import Any
 
 class ContentManager:
-    def __init__(self) -> None: ...
     def get_content(self, msg: Message, *args: Any, **kw: Any) -> Any: ...
     def set_content(self, msg: Message, obj: Any, *args: Any, **kw: Any) -> Any: ...
     def add_get_handler(self, key: str, handler: Callable[..., Any]) -> None: ...
diff --git a/mypy/typeshed/stdlib/formatter.pyi b/mypy/typeshed/stdlib/formatter.pyi
index 642a3463b714..388dbd6071ac 100644
--- a/mypy/typeshed/stdlib/formatter.pyi
+++ b/mypy/typeshed/stdlib/formatter.pyi
@@ -64,7 +64,6 @@ class AbstractFormatter:
     def assert_line_data(self, flag: int = ...) -> None: ...
 
 class NullWriter:
-    def __init__(self) -> None: ...
     def flush(self) -> None: ...
     def new_alignment(self, align: str | None) -> None: ...
     def new_font(self, font: _FontType) -> None: ...
diff --git a/mypy/typeshed/stdlib/importlib/abc.pyi b/mypy/typeshed/stdlib/importlib/abc.pyi
index d3eb761ba02d..708037305c67 100644
--- a/mypy/typeshed/stdlib/importlib/abc.pyi
+++ b/mypy/typeshed/stdlib/importlib/abc.pyi
@@ -1,14 +1,6 @@
 import sys
 import types
-from _typeshed import (
-    OpenBinaryMode,
-    OpenBinaryModeReading,
-    OpenBinaryModeUpdating,
-    OpenBinaryModeWriting,
-    OpenTextMode,
-    StrOrBytesPath,
-    StrPath,
-)
+from _typeshed import OpenBinaryMode, OpenBinaryModeReading, OpenBinaryModeUpdating, OpenBinaryModeWriting, OpenTextMode
 from abc import ABCMeta, abstractmethod
 from collections.abc import Iterator, Mapping, Sequence
 from importlib.machinery import ModuleSpec
@@ -93,9 +85,9 @@ class FileLoader(ResourceLoader, ExecutionLoader, metaclass=ABCMeta):
 
 class ResourceReader(metaclass=ABCMeta):
     @abstractmethod
-    def open_resource(self, resource: StrOrBytesPath) -> IO[bytes]: ...
+    def open_resource(self, resource: str) -> IO[bytes]: ...
     @abstractmethod
-    def resource_path(self, resource: StrOrBytesPath) -> str: ...
+    def resource_path(self, resource: str) -> str: ...
     if sys.version_info >= (3, 10):
         @abstractmethod
         def is_resource(self, path: str) -> bool: ...
@@ -115,8 +107,12 @@ if sys.version_info >= (3, 9):
         def is_file(self) -> bool: ...
         @abstractmethod
         def iterdir(self) -> Iterator[Traversable]: ...
-        @abstractmethod
-        def joinpath(self, child: StrPath) -> Traversable: ...
+        if sys.version_info >= (3, 11):
+            @abstractmethod
+            def joinpath(self, *descendants: str) -> Traversable: ...
+        else:
+            @abstractmethod
+            def joinpath(self, child: str) -> Traversable: ...
         # The .open method comes from pathlib.pyi and should be kept in sync.
         @overload
         @abstractmethod
@@ -180,7 +176,7 @@ if sys.version_info >= (3, 9):
         @property
         def name(self) -> str: ...
         @abstractmethod
-        def __truediv__(self, child: StrPath) -> Traversable: ...
+        def __truediv__(self, child: str) -> Traversable: ...
         @abstractmethod
         def read_bytes(self) -> bytes: ...
         @abstractmethod
@@ -189,7 +185,7 @@ if sys.version_info >= (3, 9):
     class TraversableResources(ResourceReader):
         @abstractmethod
         def files(self) -> Traversable: ...
-        def open_resource(self, resource: StrPath) -> BufferedReader: ...  # type: ignore[override]
+        def open_resource(self, resource: str) -> BufferedReader: ...  # type: ignore[override]
         def resource_path(self, resource: Any) -> NoReturn: ...
-        def is_resource(self, path: StrPath) -> bool: ...
+        def is_resource(self, path: str) -> bool: ...
         def contents(self) -> Iterator[str]: ...
diff --git a/mypy/typeshed/stdlib/importlib/metadata/__init__.pyi b/mypy/typeshed/stdlib/importlib/metadata/__init__.pyi
index 99fecb41497d..01e35db5815e 100644
--- a/mypy/typeshed/stdlib/importlib/metadata/__init__.pyi
+++ b/mypy/typeshed/stdlib/importlib/metadata/__init__.pyi
@@ -41,6 +41,9 @@ class _EntryPointBase(NamedTuple):
 
 class EntryPoint(_EntryPointBase):
     pattern: ClassVar[Pattern[str]]
+    if sys.version_info >= (3, 11):
+        def __init__(self, name: str, value: str, group: str) -> None: ...
+
     def load(self) -> Any: ...  # Callable[[], Any] or an importable module
     @property
     def extras(self) -> list[str]: ...
diff --git a/mypy/typeshed/stdlib/inspect.pyi b/mypy/typeshed/stdlib/inspect.pyi
index 7f9667c6ebed..b97bc601271a 100644
--- a/mypy/typeshed/stdlib/inspect.pyi
+++ b/mypy/typeshed/stdlib/inspect.pyi
@@ -401,7 +401,7 @@ class BoundArguments:
 # seem to be supporting this at the moment:
 # _ClassTreeItem = list[_ClassTreeItem] | Tuple[type, Tuple[type, ...]]
 def getclasstree(classes: list[type], unique: bool = ...) -> list[Any]: ...
-def walktree(classes: list[type], children: dict[type[Any], list[type]], parent: type[Any] | None) -> list[Any]: ...
+def walktree(classes: list[type], children: Mapping[type[Any], list[type]], parent: type[Any] | None) -> list[Any]: ...
 
 class Arguments(NamedTuple):
     args: list[str]
@@ -446,8 +446,8 @@ if sys.version_info < (3, 11):
         varkw: str | None = ...,
         defaults: tuple[Any, ...] | None = ...,
         kwonlyargs: Sequence[str] | None = ...,
-        kwonlydefaults: dict[str, Any] | None = ...,
-        annotations: dict[str, Any] = ...,
+        kwonlydefaults: Mapping[str, Any] | None = ...,
+        annotations: Mapping[str, Any] = ...,
         formatarg: Callable[[str], str] = ...,
         formatvarargs: Callable[[str], str] = ...,
         formatvarkw: Callable[[str], str] = ...,
@@ -460,7 +460,7 @@ def formatargvalues(
     args: list[str],
     varargs: str | None,
     varkw: str | None,
-    locals: dict[str, Any] | None,
+    locals: Mapping[str, Any] | None,
     formatarg: Callable[[str], str] | None = ...,
     formatvarargs: Callable[[str], str] | None = ...,
     formatvarkw: Callable[[str], str] | None = ...,
diff --git a/mypy/typeshed/stdlib/lib2to3/pgen2/grammar.pyi b/mypy/typeshed/stdlib/lib2to3/pgen2/grammar.pyi
index 4d298ec6972c..aa0dd687659d 100644
--- a/mypy/typeshed/stdlib/lib2to3/pgen2/grammar.pyi
+++ b/mypy/typeshed/stdlib/lib2to3/pgen2/grammar.pyi
@@ -15,7 +15,6 @@ class Grammar:
     tokens: dict[int, int]
     symbol2label: dict[str, int]
     start: int
-    def __init__(self) -> None: ...
     def dump(self, filename: StrPath) -> None: ...
     def load(self, filename: StrPath) -> None: ...
     def copy(self: Self) -> Self: ...
diff --git a/mypy/typeshed/stdlib/lib2to3/pgen2/pgen.pyi b/mypy/typeshed/stdlib/lib2to3/pgen2/pgen.pyi
index e3ea07432d70..84ee7ae98bd0 100644
--- a/mypy/typeshed/stdlib/lib2to3/pgen2/pgen.pyi
+++ b/mypy/typeshed/stdlib/lib2to3/pgen2/pgen.pyi
@@ -32,7 +32,6 @@ class ParserGenerator:
 
 class NFAState:
     arcs: list[tuple[str | None, NFAState]]
-    def __init__(self) -> None: ...
     def addarc(self, next: NFAState, label: str | None = ...) -> None: ...
 
 class DFAState:
diff --git a/mypy/typeshed/stdlib/lib2to3/pgen2/tokenize.pyi b/mypy/typeshed/stdlib/lib2to3/pgen2/tokenize.pyi
index c9ad1e7bb411..2a9c3fbba821 100644
--- a/mypy/typeshed/stdlib/lib2to3/pgen2/tokenize.pyi
+++ b/mypy/typeshed/stdlib/lib2to3/pgen2/tokenize.pyi
@@ -87,7 +87,6 @@ class Untokenizer:
     tokens: list[str]
     prev_row: int
     prev_col: int
-    def __init__(self) -> None: ...
     def add_whitespace(self, start: _Coord) -> None: ...
     def untokenize(self, iterable: Iterable[_TokenInfo]) -> str: ...
     def compat(self, token: tuple[int, str], iterable: Iterable[_TokenInfo]) -> None: ...
diff --git a/mypy/typeshed/stdlib/logging/__init__.pyi b/mypy/typeshed/stdlib/logging/__init__.pyi
index 40b30ae98509..575fd8f9ee4b 100644
--- a/mypy/typeshed/stdlib/logging/__init__.pyi
+++ b/mypy/typeshed/stdlib/logging/__init__.pyi
@@ -81,7 +81,6 @@ _nameToLevel: dict[str, int]
 
 class Filterer:
     filters: list[Filter]
-    def __init__(self) -> None: ...
     def addFilter(self, filter: _FilterType) -> None: ...
     def removeFilter(self, filter: _FilterType) -> None: ...
     def filter(self, record: LogRecord) -> bool: ...
diff --git a/mypy/typeshed/stdlib/multiprocessing/forkserver.pyi b/mypy/typeshed/stdlib/multiprocessing/forkserver.pyi
index 93777d926ca2..10269dfbba29 100644
--- a/mypy/typeshed/stdlib/multiprocessing/forkserver.pyi
+++ b/mypy/typeshed/stdlib/multiprocessing/forkserver.pyi
@@ -9,7 +9,6 @@ MAXFDS_TO_SEND: int
 SIGNED_STRUCT: Struct
 
 class ForkServer:
-    def __init__(self) -> None: ...
     def set_forkserver_preload(self, modules_names: list[str]) -> None: ...
     def get_inherited_fds(self) -> list[int] | None: ...
     def connect_to_new_process(self, fds: Sequence[int]) -> tuple[int, int]: ...
diff --git a/mypy/typeshed/stdlib/multiprocessing/managers.pyi b/mypy/typeshed/stdlib/multiprocessing/managers.pyi
index 190b4ca12dd7..2630e5864520 100644
--- a/mypy/typeshed/stdlib/multiprocessing/managers.pyi
+++ b/mypy/typeshed/stdlib/multiprocessing/managers.pyi
@@ -82,8 +82,8 @@ class DictProxy(BaseProxy, MutableMapping[_KT, _VT]):
     @overload
     def pop(self, __key: _KT, __default: _VT | _T) -> _VT | _T: ...
     def keys(self) -> list[_KT]: ...  # type: ignore[override]
-    def values(self) -> list[tuple[_KT, _VT]]: ...  # type: ignore[override]
-    def items(self) -> list[_VT]: ...  # type: ignore[override]
+    def items(self) -> list[tuple[_KT, _VT]]: ...  # type: ignore[override]
+    def values(self) -> list[_VT]: ...  # type: ignore[override]
 
 class BaseListProxy(BaseProxy, MutableSequence[_T]):
     __builtins__: ClassVar[dict[str, Any]]
diff --git a/mypy/typeshed/stdlib/multiprocessing/resource_tracker.pyi b/mypy/typeshed/stdlib/multiprocessing/resource_tracker.pyi
index 98abb075fb3d..50f3db67467b 100644
--- a/mypy/typeshed/stdlib/multiprocessing/resource_tracker.pyi
+++ b/mypy/typeshed/stdlib/multiprocessing/resource_tracker.pyi
@@ -4,7 +4,6 @@ from collections.abc import Sized
 __all__ = ["ensure_running", "register", "unregister"]
 
 class ResourceTracker:
-    def __init__(self) -> None: ...
     def getfd(self) -> int | None: ...
     def ensure_running(self) -> None: ...
     def register(self, name: Sized, rtype: Incomplete) -> None: ...
diff --git a/mypy/typeshed/stdlib/multiprocessing/util.pyi b/mypy/typeshed/stdlib/multiprocessing/util.pyi
index e89b4a71cad4..4b93b7a6a472 100644
--- a/mypy/typeshed/stdlib/multiprocessing/util.pyi
+++ b/mypy/typeshed/stdlib/multiprocessing/util.pyi
@@ -69,12 +69,10 @@ def is_exiting() -> bool: ...
 class ForkAwareThreadLock:
     acquire: Callable[[bool, float], bool]
     release: Callable[[], None]
-    def __init__(self) -> None: ...
     def __enter__(self) -> bool: ...
     def __exit__(self, *args: object) -> None: ...
 
-class ForkAwareLocal(threading.local):
-    def __init__(self) -> None: ...
+class ForkAwareLocal(threading.local): ...
 
 MAXFD: int
 
diff --git a/mypy/typeshed/stdlib/pipes.pyi b/mypy/typeshed/stdlib/pipes.pyi
index d6bbd7eafac3..fe680bfddf5f 100644
--- a/mypy/typeshed/stdlib/pipes.pyi
+++ b/mypy/typeshed/stdlib/pipes.pyi
@@ -3,7 +3,6 @@ import os
 __all__ = ["Template"]
 
 class Template:
-    def __init__(self) -> None: ...
     def reset(self) -> None: ...
     def clone(self) -> Template: ...
     def debug(self, flag: bool) -> None: ...
diff --git a/mypy/typeshed/stdlib/pydoc.pyi b/mypy/typeshed/stdlib/pydoc.pyi
index 7f35f5eebe18..b97b191ce217 100644
--- a/mypy/typeshed/stdlib/pydoc.pyi
+++ b/mypy/typeshed/stdlib/pydoc.pyi
@@ -60,7 +60,6 @@ class Doc:
     def getdocloc(self, object: object, basedir: str = ...) -> str | None: ...
 
 class HTMLRepr(Repr):
-    def __init__(self) -> None: ...
     def escape(self, text: str) -> str: ...
     def repr(self, object: object) -> str: ...
     def repr1(self, x: object, level: complex) -> str: ...
@@ -148,7 +147,6 @@ class HTMLDoc(Doc):
     def filelink(self, url: str, path: str) -> str: ...
 
 class TextRepr(Repr):
-    def __init__(self) -> None: ...
     def repr1(self, x: object, level: complex) -> str: ...
     def repr_string(self, x: str, level: complex) -> str: ...
     def repr_str(self, x: str, level: complex) -> str: ...
diff --git a/mypy/typeshed/stdlib/reprlib.pyi b/mypy/typeshed/stdlib/reprlib.pyi
index d5554344c494..9955f12627a3 100644
--- a/mypy/typeshed/stdlib/reprlib.pyi
+++ b/mypy/typeshed/stdlib/reprlib.pyi
@@ -22,7 +22,6 @@ class Repr:
     maxlong: int
     maxstring: int
     maxother: int
-    def __init__(self) -> None: ...
     def repr(self, x: Any) -> str: ...
     def repr1(self, x: Any, level: int) -> str: ...
     def repr_tuple(self, x: tuple[Any, ...], level: int) -> str: ...
diff --git a/mypy/typeshed/stdlib/select.pyi b/mypy/typeshed/stdlib/select.pyi
index 7cfea9ea0fc1..63989730a7e9 100644
--- a/mypy/typeshed/stdlib/select.pyi
+++ b/mypy/typeshed/stdlib/select.pyi
@@ -21,7 +21,6 @@ if sys.platform != "win32":
     POLLWRNORM: int
 
 class poll:
-    def __init__(self) -> None: ...
     def register(self, fd: FileDescriptorLike, eventmask: int = ...) -> None: ...
     def modify(self, fd: FileDescriptorLike, eventmask: int) -> None: ...
     def unregister(self, fd: FileDescriptorLike) -> None: ...
diff --git a/mypy/typeshed/stdlib/sre_parse.pyi b/mypy/typeshed/stdlib/sre_parse.pyi
index e4d66d1baf52..3dcf8ad78dee 100644
--- a/mypy/typeshed/stdlib/sre_parse.pyi
+++ b/mypy/typeshed/stdlib/sre_parse.pyi
@@ -27,7 +27,6 @@ class _State:
     groupdict: dict[str, int]
     groupwidths: list[int | None]
     lookbehindgroups: int | None
-    def __init__(self) -> None: ...
     @property
     def groups(self) -> int: ...
     def opengroup(self, name: str | None = ...) -> int: ...
diff --git a/mypy/typeshed/stdlib/string.pyi b/mypy/typeshed/stdlib/string.pyi
index 5a79e9e76752..6fb803fe53be 100644
--- a/mypy/typeshed/stdlib/string.pyi
+++ b/mypy/typeshed/stdlib/string.pyi
@@ -3,7 +3,7 @@ from _typeshed import StrOrLiteralStr
 from collections.abc import Iterable, Mapping, Sequence
 from re import Pattern, RegexFlag
 from typing import Any, ClassVar, overload
-from typing_extensions import LiteralString
+from typing_extensions import LiteralString, TypeAlias
 
 __all__ = [
     "ascii_letters",
@@ -32,7 +32,14 @@ whitespace: LiteralString
 
 def capwords(s: StrOrLiteralStr, sep: StrOrLiteralStr | None = ...) -> StrOrLiteralStr: ...
 
-class Template:
+if sys.version_info >= (3, 9):
+    _TemplateMetaclass: TypeAlias = type
+else:
+    class _TemplateMetaclass(type):
+        pattern: ClassVar[str]
+        def __init__(cls, name: str, bases: tuple[type, ...], dct: dict[str, Any]) -> None: ...
+
+class Template(metaclass=_TemplateMetaclass):
     template: str
     delimiter: ClassVar[str]
     idpattern: ClassVar[str]
diff --git a/mypy/typeshed/stdlib/symtable.pyi b/mypy/typeshed/stdlib/symtable.pyi
index d44b2d7927b3..98b62edbfc6a 100644
--- a/mypy/typeshed/stdlib/symtable.pyi
+++ b/mypy/typeshed/stdlib/symtable.pyi
@@ -59,6 +59,5 @@ class Symbol:
     def get_namespace(self) -> SymbolTable: ...
 
 class SymbolTableFactory:
-    def __init__(self) -> None: ...
     def new(self, table: Any, filename: str) -> SymbolTable: ...
     def __call__(self, table: Any, filename: str) -> SymbolTable: ...
diff --git a/mypy/typeshed/stdlib/threading.pyi b/mypy/typeshed/stdlib/threading.pyi
index 289a86826ecd..6fb1ab99c833 100644
--- a/mypy/typeshed/stdlib/threading.pyi
+++ b/mypy/typeshed/stdlib/threading.pyi
@@ -102,7 +102,6 @@ class _DummyThread(Thread):
     def __init__(self) -> None: ...
 
 class Lock:
-    def __init__(self) -> None: ...
     def __enter__(self) -> bool: ...
     def __exit__(
         self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
@@ -112,7 +111,6 @@ class Lock:
     def locked(self) -> bool: ...
 
 class _RLock:
-    def __init__(self) -> None: ...
     def acquire(self, blocking: bool = ..., timeout: float = ...) -> bool: ...
     def release(self) -> None: ...
     __enter__ = acquire
@@ -148,7 +146,6 @@ class Semaphore:
 class BoundedSemaphore(Semaphore): ...
 
 class Event:
-    def __init__(self) -> None: ...
     def is_set(self) -> bool: ...
     def isSet(self) -> bool: ...  # deprecated alias for is_set()
     def set(self) -> None: ...
diff --git a/mypy/typeshed/stdlib/tokenize.pyi b/mypy/typeshed/stdlib/tokenize.pyi
index 1a67736e78de..6f242a6cd1ef 100644
--- a/mypy/typeshed/stdlib/tokenize.pyi
+++ b/mypy/typeshed/stdlib/tokenize.pyi
@@ -115,7 +115,6 @@ class Untokenizer:
     prev_row: int
     prev_col: int
     encoding: str | None
-    def __init__(self) -> None: ...
     def add_whitespace(self, start: _Position) -> None: ...
     def untokenize(self, iterable: Iterable[_Token]) -> str: ...
     def compat(self, token: Sequence[int | str], iterable: Iterable[_Token]) -> None: ...
diff --git a/mypy/typeshed/stdlib/traceback.pyi b/mypy/typeshed/stdlib/traceback.pyi
index 13e070e6d150..bf8e24e7ab27 100644
--- a/mypy/typeshed/stdlib/traceback.pyi
+++ b/mypy/typeshed/stdlib/traceback.pyi
@@ -98,7 +98,6 @@ def walk_tb(tb: TracebackType | None) -> Iterator[tuple[FrameType, int]]: ...
 
 if sys.version_info >= (3, 11):
     class _ExceptionPrintContext:
-        def __init__(self) -> None: ...
         def indent(self) -> str: ...
         def emit(self, text_gen: str | Iterable[str], margin_char: str | None = ...) -> Generator[str, None, None]: ...
 
diff --git a/mypy/typeshed/stdlib/typing_extensions.pyi b/mypy/typeshed/stdlib/typing_extensions.pyi
index 787af1f4034e..df2c1c431c65 100644
--- a/mypy/typeshed/stdlib/typing_extensions.pyi
+++ b/mypy/typeshed/stdlib/typing_extensions.pyi
@@ -2,12 +2,13 @@ import _typeshed
 import abc
 import collections
 import sys
+import typing
 from _collections_abc import dict_items, dict_keys, dict_values
-from _typeshed import IdentityFunction
+from _typeshed import IdentityFunction, Incomplete
 from collections.abc import Iterable
 from typing import (  # noqa: Y022,Y027,Y039
     TYPE_CHECKING as TYPE_CHECKING,
-    Any,
+    Any as Any,
     AsyncContextManager as AsyncContextManager,
     AsyncGenerator as AsyncGenerator,
     AsyncIterable as AsyncIterable,
@@ -27,13 +28,13 @@ from typing import (  # noqa: Y022,Y027,Y039
     Sequence,
     Text as Text,
     Type as Type,
-    TypeVar,
     _Alias,
     overload as overload,
     type_check_only,
 )
 
 __all__ = [
+    "Any",
     "ClassVar",
     "Concatenate",
     "Final",
@@ -43,6 +44,7 @@ __all__ = [
     "ParamSpecKwargs",
     "Self",
     "Type",
+    "TypeVar",
     "TypeVarTuple",
     "Unpack",
     "Awaitable",
@@ -70,6 +72,7 @@ __all__ = [
     "Literal",
     "NewType",
     "overload",
+    "override",
     "Protocol",
     "reveal_type",
     "runtime",
@@ -89,9 +92,9 @@ __all__ = [
     "get_type_hints",
 ]
 
-_T = TypeVar("_T")
-_F = TypeVar("_F", bound=Callable[..., Any])
-_TC = TypeVar("_TC", bound=Type[object])
+_T = typing.TypeVar("_T")
+_F = typing.TypeVar("_F", bound=Callable[..., Any])
+_TC = typing.TypeVar("_TC", bound=Type[object])
 
 # unfortunately we have to duplicate this class definition from typing.pyi or we break pytype
 class _SpecialForm:
@@ -167,7 +170,6 @@ class SupportsIndex(Protocol, metaclass=abc.ABCMeta):
 if sys.version_info >= (3, 10):
     from typing import (
         Concatenate as Concatenate,
-        ParamSpec as ParamSpec,
         ParamSpecArgs as ParamSpecArgs,
         ParamSpecKwargs as ParamSpecKwargs,
         TypeAlias as TypeAlias,
@@ -183,18 +185,6 @@ else:
         __origin__: ParamSpec
         def __init__(self, origin: ParamSpec) -> None: ...
 
-    class ParamSpec:
-        __name__: str
-        __bound__: type[Any] | None
-        __covariant__: bool
-        __contravariant__: bool
-        def __init__(
-            self, name: str, *, bound: None | type[Any] | str = ..., contravariant: bool = ..., covariant: bool = ...
-        ) -> None: ...
-        @property
-        def args(self) -> ParamSpecArgs: ...
-        @property
-        def kwargs(self) -> ParamSpecKwargs: ...
     Concatenate: _SpecialForm
     TypeAlias: _SpecialForm
     TypeGuard: _SpecialForm
@@ -210,7 +200,6 @@ if sys.version_info >= (3, 11):
         NotRequired as NotRequired,
         Required as Required,
         Self as Self,
-        TypeVarTuple as TypeVarTuple,
         Unpack as Unpack,
         assert_never as assert_never,
         assert_type as assert_type,
@@ -233,12 +222,6 @@ else:
     LiteralString: _SpecialForm
     Unpack: _SpecialForm
 
-    @final
-    class TypeVarTuple:
-        __name__: str
-        def __init__(self, name: str) -> None: ...
-        def __iter__(self) -> Any: ...  # Unpack[Self]
-
     def dataclass_transform(
         *,
         eq_default: bool = ...,
@@ -268,3 +251,61 @@ else:
             def _asdict(self) -> collections.OrderedDict[str, Any]: ...
 
         def _replace(self: _typeshed.Self, **kwargs: Any) -> _typeshed.Self: ...
+
+# New things in 3.xx
+# The `default` parameter was added to TypeVar, ParamSpec, and TypeVarTuple (PEP 696)
+# The `infer_variance` parameter was added to TypeVar (PEP 695)
+# typing_extensions.override (PEP 698)
+@final
+class TypeVar:
+    __name__: str
+    __bound__: Any | None
+    __constraints__: tuple[Any, ...]
+    __covariant__: bool
+    __contravariant__: bool
+    __default__: Any | None
+    def __init__(
+        self,
+        name: str,
+        *constraints: Any,
+        bound: Any | None = ...,
+        covariant: bool = ...,
+        contravariant: bool = ...,
+        default: Any | None = ...,
+        infer_variance: bool = ...,
+    ) -> None: ...
+    if sys.version_info >= (3, 10):
+        def __or__(self, right: Any) -> _SpecialForm: ...
+        def __ror__(self, left: Any) -> _SpecialForm: ...
+    if sys.version_info >= (3, 11):
+        def __typing_subst__(self, arg: Incomplete) -> Incomplete: ...
+
+@final
+class ParamSpec:
+    __name__: str
+    __bound__: type[Any] | None
+    __covariant__: bool
+    __contravariant__: bool
+    __default__: type[Any] | None
+    def __init__(
+        self,
+        name: str,
+        *,
+        bound: None | type[Any] | str = ...,
+        contravariant: bool = ...,
+        covariant: bool = ...,
+        default: type[Any] | str | None = ...,
+    ) -> None: ...
+    @property
+    def args(self) -> ParamSpecArgs: ...
+    @property
+    def kwargs(self) -> ParamSpecKwargs: ...
+
+@final
+class TypeVarTuple:
+    __name__: str
+    __default__: Any | None
+    def __init__(self, name: str, *, default: Any | None = ...) -> None: ...
+    def __iter__(self) -> Any: ...  # Unpack[Self]
+
+def override(__arg: _F) -> _F: ...
diff --git a/mypy/typeshed/stdlib/unittest/mock.pyi b/mypy/typeshed/stdlib/unittest/mock.pyi
index 9dab412f4228..133380fce334 100644
--- a/mypy/typeshed/stdlib/unittest/mock.pyi
+++ b/mypy/typeshed/stdlib/unittest/mock.pyi
@@ -55,7 +55,6 @@ class _SentinelObject:
     def __init__(self, name: Any) -> None: ...
 
 class _Sentinel:
-    def __init__(self) -> None: ...
     def __getattr__(self, name: str) -> Any: ...
 
 sentinel: Any
diff --git a/mypy/typeshed/stdlib/xdrlib.pyi b/mypy/typeshed/stdlib/xdrlib.pyi
index e0b8c6a54b00..78f3ecec8d78 100644
--- a/mypy/typeshed/stdlib/xdrlib.pyi
+++ b/mypy/typeshed/stdlib/xdrlib.pyi
@@ -12,7 +12,6 @@ class Error(Exception):
 class ConversionError(Error): ...
 
 class Packer:
-    def __init__(self) -> None: ...
     def reset(self) -> None: ...
     def get_buffer(self) -> bytes: ...
     def get_buf(self) -> bytes: ...
diff --git a/mypy/typeshed/stdlib/xml/dom/xmlbuilder.pyi b/mypy/typeshed/stdlib/xml/dom/xmlbuilder.pyi
index a96d6ee78abd..341d717e043b 100644
--- a/mypy/typeshed/stdlib/xml/dom/xmlbuilder.pyi
+++ b/mypy/typeshed/stdlib/xml/dom/xmlbuilder.pyi
@@ -56,7 +56,6 @@ class DOMBuilder:
     ACTION_APPEND_AS_CHILDREN: Literal[2]
     ACTION_INSERT_AFTER: Literal[3]
     ACTION_INSERT_BEFORE: Literal[4]
-    def __init__(self) -> None: ...
     def setFeature(self, name: str, state: int) -> None: ...
     def supportsFeature(self, name: str) -> bool: ...
     def canSetFeature(self, name: str, state: int) -> bool: ...
diff --git a/mypy/typeshed/stdlib/xml/sax/handler.pyi b/mypy/typeshed/stdlib/xml/sax/handler.pyi
index 7aeb41405e04..63b725bd6da6 100644
--- a/mypy/typeshed/stdlib/xml/sax/handler.pyi
+++ b/mypy/typeshed/stdlib/xml/sax/handler.pyi
@@ -9,7 +9,6 @@ class ErrorHandler:
     def warning(self, exception: BaseException) -> None: ...
 
 class ContentHandler:
-    def __init__(self) -> None: ...
     def setDocumentLocator(self, locator): ...
     def startDocument(self): ...
     def endDocument(self): ...
diff --git a/mypy/typeshed/stdlib/xml/sax/xmlreader.pyi b/mypy/typeshed/stdlib/xml/sax/xmlreader.pyi
index d7d4db5b0a16..517c17072b87 100644
--- a/mypy/typeshed/stdlib/xml/sax/xmlreader.pyi
+++ b/mypy/typeshed/stdlib/xml/sax/xmlreader.pyi
@@ -1,7 +1,6 @@
 from collections.abc import Mapping
 
 class XMLReader:
-    def __init__(self) -> None: ...
     def parse(self, source): ...
     def getContentHandler(self): ...
     def setContentHandler(self, handler): ...
diff --git a/mypy/typeshed/stdlib/xmlrpc/server.pyi b/mypy/typeshed/stdlib/xmlrpc/server.pyi
index 96abf7d3d63b..c11d8d8e7a14 100644
--- a/mypy/typeshed/stdlib/xmlrpc/server.pyi
+++ b/mypy/typeshed/stdlib/xmlrpc/server.pyi
@@ -127,7 +127,6 @@ class XMLRPCDocGenerator:  # undocumented
     server_name: str
     server_documentation: str
     server_title: str
-    def __init__(self) -> None: ...
     def set_server_title(self, server_title: str) -> None: ...
     def set_server_name(self, server_name: str) -> None: ...
     def set_server_documentation(self, server_documentation: str) -> None: ...
diff --git a/mypy/typeshed/stdlib/zoneinfo/__init__.pyi b/mypy/typeshed/stdlib/zoneinfo/__init__.pyi
index 1a0760862733..7f22c07b32c0 100644
--- a/mypy/typeshed/stdlib/zoneinfo/__init__.pyi
+++ b/mypy/typeshed/stdlib/zoneinfo/__init__.pyi
@@ -18,7 +18,7 @@ class ZoneInfo(tzinfo):
     @classmethod
     def from_file(cls: type[Self], __fobj: _IOBytes, key: str | None = ...) -> Self: ...
     @classmethod
-    def clear_cache(cls, *, only_keys: Iterable[str] = ...) -> None: ...
+    def clear_cache(cls, *, only_keys: Iterable[str] | None = ...) -> None: ...
 
 # Note: Both here and in clear_cache, the types allow the use of `str` where
 # a sequence of strings is required. This should be remedied if a solution

From fd6f05b0e8d237c8c112b8c6aa78962ca676b446 Mon Sep 17 00:00:00 2001
From: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
Date: Mon, 26 Sep 2022 12:55:07 -0700
Subject: [PATCH 2/3] Remove use of LiteralString in builtins (#13743)

---
 mypy/typeshed/stdlib/builtins.pyi | 94 +------------------------------
 1 file changed, 1 insertion(+), 93 deletions(-)

diff --git a/mypy/typeshed/stdlib/builtins.pyi b/mypy/typeshed/stdlib/builtins.pyi
index baa7f15a7346..ed60a7c018e7 100644
--- a/mypy/typeshed/stdlib/builtins.pyi
+++ b/mypy/typeshed/stdlib/builtins.pyi
@@ -55,7 +55,7 @@ from typing import (  # noqa: Y027
     overload,
     type_check_only,
 )
-from typing_extensions import Literal, LiteralString, SupportsIndex, TypeAlias, TypeGuard, final
+from typing_extensions import Literal, SupportsIndex, TypeAlias, TypeGuard, final
 
 if sys.version_info >= (3, 9):
     from types import GenericAlias
@@ -414,17 +414,8 @@ class str(Sequence[str]):
     def __new__(cls: type[Self], object: object = ...) -> Self: ...
     @overload
     def __new__(cls: type[Self], object: ReadableBuffer, encoding: str = ..., errors: str = ...) -> Self: ...
-    @overload
-    def capitalize(self: LiteralString) -> LiteralString: ...
-    @overload
     def capitalize(self) -> str: ...  # type: ignore[misc]
-    @overload
-    def casefold(self: LiteralString) -> LiteralString: ...
-    @overload
     def casefold(self) -> str: ...  # type: ignore[misc]
-    @overload
-    def center(self: LiteralString, __width: SupportsIndex, __fillchar: LiteralString = ...) -> LiteralString: ...
-    @overload
     def center(self, __width: SupportsIndex, __fillchar: str = ...) -> str: ...  # type: ignore[misc]
     def count(self, x: str, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...) -> int: ...
     def encode(self, encoding: str = ..., errors: str = ...) -> bytes: ...
@@ -432,20 +423,11 @@ class str(Sequence[str]):
         self, __suffix: str | tuple[str, ...], __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...
     ) -> bool: ...
     if sys.version_info >= (3, 8):
-        @overload
-        def expandtabs(self: LiteralString, tabsize: SupportsIndex = ...) -> LiteralString: ...
-        @overload
         def expandtabs(self, tabsize: SupportsIndex = ...) -> str: ...  # type: ignore[misc]
     else:
-        @overload
-        def expandtabs(self: LiteralString, tabsize: int = ...) -> LiteralString: ...
-        @overload
         def expandtabs(self, tabsize: int = ...) -> str: ...  # type: ignore[misc]
 
     def find(self, __sub: str, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...) -> int: ...
-    @overload
-    def format(self: LiteralString, *args: LiteralString, **kwargs: LiteralString) -> LiteralString: ...
-    @overload
     def format(self, *args: object, **kwargs: object) -> str: ...  # type: ignore[misc]
     def format_map(self, map: _FormatMapMapping) -> str: ...
     def index(self, __sub: str, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...) -> int: ...
@@ -461,91 +443,32 @@ class str(Sequence[str]):
     def isspace(self) -> bool: ...
     def istitle(self) -> bool: ...
     def isupper(self) -> bool: ...
-    @overload
-    def join(self: LiteralString, __iterable: Iterable[LiteralString]) -> LiteralString: ...
-    @overload
     def join(self, __iterable: Iterable[str]) -> str: ...  # type: ignore[misc]
-    @overload
-    def ljust(self: LiteralString, __width: SupportsIndex, __fillchar: LiteralString = ...) -> LiteralString: ...
-    @overload
     def ljust(self, __width: SupportsIndex, __fillchar: str = ...) -> str: ...  # type: ignore[misc]
-    @overload
-    def lower(self: LiteralString) -> LiteralString: ...
-    @overload
     def lower(self) -> str: ...  # type: ignore[misc]
-    @overload
-    def lstrip(self: LiteralString, __chars: LiteralString | None = ...) -> LiteralString: ...
-    @overload
     def lstrip(self, __chars: str | None = ...) -> str: ...  # type: ignore[misc]
-    @overload
-    def partition(self: LiteralString, __sep: LiteralString) -> tuple[LiteralString, LiteralString, LiteralString]: ...
-    @overload
     def partition(self, __sep: str) -> tuple[str, str, str]: ...  # type: ignore[misc]
-    @overload
-    def replace(
-        self: LiteralString, __old: LiteralString, __new: LiteralString, __count: SupportsIndex = ...
-    ) -> LiteralString: ...
-    @overload
     def replace(self, __old: str, __new: str, __count: SupportsIndex = ...) -> str: ...  # type: ignore[misc]
     if sys.version_info >= (3, 9):
-        @overload
-        def removeprefix(self: LiteralString, __prefix: LiteralString) -> LiteralString: ...
-        @overload
         def removeprefix(self, __prefix: str) -> str: ...  # type: ignore[misc]
-        @overload
-        def removesuffix(self: LiteralString, __suffix: LiteralString) -> LiteralString: ...
-        @overload
         def removesuffix(self, __suffix: str) -> str: ...  # type: ignore[misc]
 
     def rfind(self, __sub: str, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...) -> int: ...
     def rindex(self, __sub: str, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...) -> int: ...
-    @overload
-    def rjust(self: LiteralString, __width: SupportsIndex, __fillchar: LiteralString = ...) -> LiteralString: ...
-    @overload
     def rjust(self, __width: SupportsIndex, __fillchar: str = ...) -> str: ...  # type: ignore[misc]
-    @overload
-    def rpartition(self: LiteralString, __sep: LiteralString) -> tuple[LiteralString, LiteralString, LiteralString]: ...
-    @overload
     def rpartition(self, __sep: str) -> tuple[str, str, str]: ...  # type: ignore[misc]
-    @overload
-    def rsplit(self: LiteralString, sep: LiteralString | None = ..., maxsplit: SupportsIndex = ...) -> list[LiteralString]: ...
-    @overload
     def rsplit(self, sep: str | None = ..., maxsplit: SupportsIndex = ...) -> list[str]: ...  # type: ignore[misc]
-    @overload
-    def rstrip(self: LiteralString, __chars: LiteralString | None = ...) -> LiteralString: ...
-    @overload
     def rstrip(self, __chars: str | None = ...) -> str: ...  # type: ignore[misc]
-    @overload
-    def split(self: LiteralString, sep: LiteralString | None = ..., maxsplit: SupportsIndex = ...) -> list[LiteralString]: ...
-    @overload
     def split(self, sep: str | None = ..., maxsplit: SupportsIndex = ...) -> list[str]: ...  # type: ignore[misc]
-    @overload
-    def splitlines(self: LiteralString, keepends: bool = ...) -> list[LiteralString]: ...
-    @overload
     def splitlines(self, keepends: bool = ...) -> list[str]: ...  # type: ignore[misc]
     def startswith(
         self, __prefix: str | tuple[str, ...], __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...
     ) -> bool: ...
-    @overload
-    def strip(self: LiteralString, __chars: LiteralString | None = ...) -> LiteralString: ...
-    @overload
     def strip(self, __chars: str | None = ...) -> str: ...  # type: ignore[misc]
-    @overload
-    def swapcase(self: LiteralString) -> LiteralString: ...
-    @overload
     def swapcase(self) -> str: ...  # type: ignore[misc]
-    @overload
-    def title(self: LiteralString) -> LiteralString: ...
-    @overload
     def title(self) -> str: ...  # type: ignore[misc]
     def translate(self, __table: _TranslateTable) -> str: ...
-    @overload
-    def upper(self: LiteralString) -> LiteralString: ...
-    @overload
     def upper(self) -> str: ...  # type: ignore[misc]
-    @overload
-    def zfill(self: LiteralString, __width: SupportsIndex) -> LiteralString: ...
-    @overload
     def zfill(self, __width: SupportsIndex) -> str: ...  # type: ignore[misc]
     @staticmethod
     @overload
@@ -553,9 +476,6 @@ class str(Sequence[str]):
     @staticmethod
     @overload
     def maketrans(__x: str, __y: str, __z: str | None = ...) -> dict[int, int | None]: ...
-    @overload
-    def __add__(self: LiteralString, __s: LiteralString) -> LiteralString: ...
-    @overload
     def __add__(self, __s: str) -> str: ...  # type: ignore[misc]
     # Incompatible with Sequence.__contains__
     def __contains__(self, __o: str) -> bool: ...  # type: ignore[override]
@@ -563,25 +483,13 @@ class str(Sequence[str]):
     def __ge__(self, __x: str) -> bool: ...
     def __getitem__(self, __i: SupportsIndex | slice) -> str: ...
     def __gt__(self, __x: 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 __len__(self) -> int: ...
     def __lt__(self, __x: str) -> bool: ...
-    @overload
-    def __mod__(self: LiteralString, __x: LiteralString | tuple[LiteralString, ...]) -> LiteralString: ...
-    @overload
     def __mod__(self, __x: Any) -> str: ...  # type: ignore[misc]
-    @overload
-    def __mul__(self: LiteralString, __n: SupportsIndex) -> LiteralString: ...
-    @overload
     def __mul__(self, __n: SupportsIndex) -> str: ...  # type: ignore[misc]
     def __ne__(self, __x: object) -> bool: ...
-    @overload
-    def __rmul__(self: LiteralString, __n: SupportsIndex) -> LiteralString: ...
-    @overload
     def __rmul__(self, __n: SupportsIndex) -> str: ...  # type: ignore[misc]
     def __getnewargs__(self) -> tuple[str]: ...
 

From 07556e284afa570d98a50772fade294dc4f82983 Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Fri, 7 Oct 2022 07:04:05 +0200
Subject: [PATCH 3/3] Typeshed cherry-pick: Use general type ignore for
 asyncio.Task (#8861)

---
 mypy/typeshed/stdlib/asyncio/tasks.pyi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mypy/typeshed/stdlib/asyncio/tasks.pyi b/mypy/typeshed/stdlib/asyncio/tasks.pyi
index 27d80be8d8f5..67581eb6a5ad 100644
--- a/mypy/typeshed/stdlib/asyncio/tasks.pyi
+++ b/mypy/typeshed/stdlib/asyncio/tasks.pyi
@@ -266,11 +266,11 @@ else:
     ) -> tuple[set[Task[_T]], set[Task[_T]]]: ...
     async def wait_for(fut: _FutureLike[_T], timeout: float | None, *, loop: AbstractEventLoop | None = ...) -> _T: ...
 
-# pyright complains that a subclass of an invariant class shouldn't be covariant.
+# mypy and pyright complain that a subclass of an invariant class shouldn't be covariant.
 # While this is true in general, here it's sort-of okay to have a covariant subclass,
 # since the only reason why `asyncio.Future` is invariant is the `set_result()` method,
 # and `asyncio.Task.set_result()` always raises.
-class Task(Future[_T_co], Generic[_T_co]):  # pyright: ignore[reportGeneralTypeIssues]
+class Task(Future[_T_co], Generic[_T_co]):  # type: ignore[type-var]
     if sys.version_info >= (3, 8):
         def __init__(
             self,