Merge remote-tracking branch 'origin/python315' into python315

Author: JelleZijlstra

stdlib/ast.pyi

@@ -712,7 +712,7 @@ class Assert(stmt):
 class Import(stmt):
     if sys.version_info >= (3, 15):
         __match_args__ = ("names", "is_lazy")
-    elif sys.version_info >= (3, 10):
+    else:
         __match_args__ = ("names",)
     names: list[alias]
     if sys.version_info >= (3, 15):
@@ -734,7 +734,7 @@ class Import(stmt):
 class ImportFrom(stmt):
     if sys.version_info >= (3, 15):
         __match_args__ = ("module", "names", "level", "is_lazy")
-    elif sys.version_info >= (3, 10):
+    else:
         __match_args__ = ("module", "names", "level")
     module: str | None
     names: list[alias]

stdlib/base64.pyi

@@ -73,20 +73,20 @@ else:
     def b16encode(s: ReadableBuffer) -> bytes: ...
     def b16decode(s: str | ReadableBuffer, casefold: bool = False) -> bytes: ...
 
-if sys.version_info >= (3, 10):
-    if sys.version_info >= (3, 15):
-        def b32hexencode(s: ReadableBuffer, *, padded: bool = True, wrapcol: int = 0) -> bytes: ...
-        def b32hexdecode(
-            s: str | ReadableBuffer,
-            casefold: bool = False,
-            *,
-            padded: bool = True,
-            ignorechars: ReadableBuffer = b"",
-            canonical: bool = False,
-        ) -> bytes: ...
-    else:
-        def b32hexencode(s: ReadableBuffer) -> bytes: ...
-        def b32hexdecode(s: str | ReadableBuffer, casefold: bool = False) -> bytes: ...
+if sys.version_info >= (3, 15):
+    def b32hexencode(s: ReadableBuffer, *, padded: bool = True, wrapcol: int = 0) -> bytes: ...
+    def b32hexdecode(
+        s: str | ReadableBuffer,
+        casefold: bool = False,
+        *,
+        padded: bool = True,
+        ignorechars: ReadableBuffer = b"",
+        canonical: bool = False,
+    ) -> bytes: ...
+
+else:
+    def b32hexencode(s: ReadableBuffer) -> bytes: ...
+    def b32hexdecode(s: str | ReadableBuffer, casefold: bool = False) -> bytes: ...
 
 def a85encode(
     b: ReadableBuffer, *, foldspaces: bool = False, wrapcol: int = 0, pad: bool = False, adobe: bool = False

stdlib/profiling/tracing.pyi

@@ -1,6 +1,6 @@
 from cProfile import Profile as Profile, run as run, runctx as runctx
 from types import CodeType
-from typing_extensions import TypeAlias
+from typing import TypeAlias
 
 __all__ = ["run", "runctx", "Profile"]