Merge branch 'main' into codex/python315-urllib

Author: JelleZijlstra

.github/workflows/tests.yml

@@ -71,9 +71,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
-          python-version: "3.15"
-          allow-prereleases: true
-          check-latest: true
+          python-version: "3.14"
       - uses: astral-sh/setup-uv@v7
         with:
           version-file: "requirements-tests.txt"

requirements-tests.txt

@@ -1,6 +1,6 @@
 # Type checkers that we test our stubs against. These should always
 # be pinned to a specific version to make failure reproducible.
-mypy==1.20.0
+mypy==2.0.0
 pyright==1.1.409
 
 # Libraries used by our various scripts.

stdlib/@tests/stubtest_allowlists/darwin-py315.txt

@@ -2,14 +2,12 @@
 # TODO: Allowlist entries that should be fixed
 # ============================================
 
-_decimal.SPEC_VERSION
 _pyrepl.fancy_termios
 _pyrepl.unix_console
 _pyrepl.unix_eventqueue
 ctypes.c_double_complex._type_
 ctypes.c_float_complex._type_
 ctypes.c_longdouble_complex._type_
-decimal.SPEC_VERSION
 mmap.MS_ASYNC
 mmap.MS_INVALIDATE
 mmap.MS_SYNC

stdlib/@tests/stubtest_allowlists/py315.txt

@@ -2,7 +2,6 @@
 # TODO: Allowlist entries that should be fixed
 # ============================================
 
-_collections_abc.__all__
 _frozen_importlib.BuiltinImporter.load_module
 _frozen_importlib.FrozenImporter.load_module
 _frozen_importlib_external.FileFinder.discover
@@ -15,10 +14,6 @@ _frozen_importlib_external._LoaderBasics.load_module
 _frozen_importlib_external.cache_from_source
 _interpqueues.create
 _interpqueues.put
-_json.make_scanner.array_hook
-_json.scanstring
-_pydecimal.SPEC_VERSION
-_pydecimal.__all__
 _pyrepl.base_eventqueue
 _pyrepl.commands
 _pyrepl.completing_reader
@@ -41,7 +36,6 @@ _pyrepl.types
 _pyrepl.utils
 _pyrepl.windows_console
 _pyrepl.windows_eventqueue
-_sqlite3.SQLITE_KEYWORDS
 _ssl.HAS_PSK_TLS13
 _ssl._SSLContext.get_groups
 _ssl._SSLContext.set_ciphersuites
@@ -66,75 +60,9 @@ annotationlib.ForwardRef.__resolved_str__
 annotationlib.ForwardRef.__resolved_str_cache__
 annotationlib.ForwardRef.__slots__
 annotationlib.ForwardRef.__stringifier_dict__
-argparse.ArgumentParser.__init__
-argparse.ArgumentParser._get_formatter
-argparse.ArgumentParser.format_help
-argparse.ArgumentParser.format_usage
-argparse.HelpFormatter.__init__
-array.typecodes
-ast.DictComp.value
-ast.Import.__match_args__
-ast.Import.is_lazy
-ast.ImportFrom.__match_args__
-ast.ImportFrom.is_lazy
-ast.dump
-ast.parse
 ast.type_param.__init__
-asyncio.taskgroups.TaskGroup.cancel
-asyncio.tools.display_awaited_by_tasks_table
-asyncio.tools.display_awaited_by_tasks_tree
-base64.a85decode
-base64.b16decode
-base64.b16encode
-base64.b32decode
-base64.b32encode
-base64.b32hexdecode
-base64.b32hexencode
+# base64.b64decode uses a private sentinel list as the default for parameters whose public types are bool/buffer.
 base64.b64decode
-base64.b64encode
-base64.b85decode
-base64.b85encode
-base64.urlsafe_b64decode
-base64.urlsafe_b64encode
-base64.z85decode
-base64.z85encode
-binascii.ASCII85_ALPHABET
-binascii.BASE32HEX_ALPHABET
-binascii.BASE32_ALPHABET
-binascii.BASE64_ALPHABET
-binascii.BASE85_ALPHABET
-binascii.BINHEX_ALPHABET
-binascii.CRYPT_ALPHABET
-binascii.URLSAFE_BASE64_ALPHABET
-binascii.UU_ALPHABET
-binascii.Z85_ALPHABET
-binascii.a2b_ascii85
-binascii.a2b_base32
-binascii.a2b_base64
-binascii.a2b_base85
-binascii.a2b_hex
-binascii.b2a_ascii85
-binascii.b2a_base32
-binascii.b2a_base64
-binascii.b2a_base85
-binascii.unhexlify
-builtins.ImportCycleError
-builtins.__lazy_import__
-builtins.bin
-builtins.bytearray.replace
-builtins.bytearray.take_bytes
-builtins.bytes.replace
-builtins.compile
-builtins.frozendict
-builtins.hex
-builtins.oct
-builtins.sentinel
-builtins.slice.__class_getitem__
-cProfile.label
-calendar.HTMLCalendar.formatmonthpage
-calendar.__all__
-calendar.standalone_month_abbr
-calendar.standalone_month_name
 codecs.backslashreplace_errors
 codecs.ignore_errors
 codecs.namereplace_errors
@@ -143,7 +71,6 @@ codecs.strict_errors
 codecs.xmlcharrefreplace_errors
 collections.Counter.__ixor__
 collections.Counter.__xor__
-collections.abc.__all__
 concurrent.interpreters._crossinterp.UNBOUND_ERROR
 concurrent.interpreters._crossinterp.UNBOUND_REMOVE
 concurrent.interpreters._crossinterp.UnboundItem.singleton
@@ -158,16 +85,8 @@ concurrent.interpreters._crossinterp.classonly.__wrapped__
 copy.deepcopy
 ctypes.SetPointerType
 dataclasses._MISSING_TYPE
-datetime.date.fromisoformat
-datetime.date.strptime
-datetime.datetime.fromisoformat
-datetime.datetime.strptime
-datetime.time.fromisoformat
-datetime.time.strptime
-dbm.dumb._Database.reorganize
-dbm.sqlite3.REORGANIZE
-dbm.sqlite3._Database.reorganize
-difflib.unified_diff
+dataclasses.MISSING
+dataclasses.field
 doctest.DocTestRunner.report_skip
 enum.__all__
 enum.auto.__init__
@@ -214,9 +133,6 @@ io.Reader.__class_getitem__
 io.Reader.read
 io.Writer.__class_getitem__
 io.Writer.write
-json.decoder.JSONDecoder.__init__
-json.load
-json.loads
 mailbox.Mailbox.__enter__
 mailbox.Mailbox.__exit__
 mailbox._ProxyFile.__class_getitem__
@@ -294,32 +210,12 @@ profiling.sampling.sample
 profiling.sampling.stack_collector
 profiling.sampling.string_table
 profiling.tracing
-pstats.Stats.print_call_subheading
 pydoc.Doc.STDLIB_DIR
 pydoc.Doc.getdocloc
-pyexpat.XMLParserType.SetBillionLaughsAttackProtectionActivationThreshold
-pyexpat.XMLParserType.SetBillionLaughsAttackProtectionMaximumAmplification
-re.Pattern.prefixmatch
-re.__all__
-re.prefixmatch
-shelve.BsdDbShelf.__init__
-shelve.DbfilenameShelf.__init__
-shelve.Shelf.__init__
-shelve.Shelf.reorganize
-shelve.ShelveError
-shelve.__all__
-shelve.open
 site.addsitedir
 site.addsitepackages
 site.addusersitepackages
 site.process_startup_files
-sqlite3.Connection.create_aggregate
-sqlite3.Connection.create_function
-sqlite3.Connection.set_authorizer
-sqlite3.Connection.set_progress_handler
-sqlite3.Connection.set_trace_callback
-sqlite3.SQLITE_KEYWORDS
-sqlite3.dbapi2.SQLITE_KEYWORDS
 sre_compile
 sre_constants
 sre_parse
@@ -329,18 +225,6 @@ ssl.SSLObject.server_sigalg
 ssl.SSLSocket.client_sigalg
 ssl.SSLSocket.group
 ssl.SSLSocket.server_sigalg
-stat.STATX_ATTR_APPEND
-stat.STATX_ATTR_AUTOMOUNT
-stat.STATX_ATTR_COMPRESSED
-stat.STATX_ATTR_DAX
-stat.STATX_ATTR_ENCRYPTED
-stat.STATX_ATTR_IMMUTABLE
-stat.STATX_ATTR_MOUNT_ROOT
-stat.STATX_ATTR_NODUMP
-stat.STATX_ATTR_VERITY
-stat.STATX_ATTR_WRITE_ATOMIC
-symtable.Function.get_cells
-symtable.Symbol.is_cell
 symtable.symtable
 sys.__jit
 sys._monitoring
@@ -351,8 +235,6 @@ sys.last_exc
 sys.lazy_modules
 sys.set_lazy_imports
 sys.set_lazy_imports_filter
-sysconfig.is_python_build
-tarfile.TarFile.__init__
 threading.Condition.locked
 threading.__all__
 threading.concurrent_tee
@@ -391,50 +273,18 @@ types.UnionType.__qualname__
 types.__all__
 typing.LiteralString
 typing.NewType.__mro_entries__
-typing.NoExtraItems
 typing.ParamSpec.__mro_entries__
 typing.ParamSpecArgs.__mro_entries__
 typing.ParamSpecKwargs.__mro_entries__
 typing.SupportsAbs.__type_params__
 typing.SupportsRound.__type_params__
-typing.TypeAliasType.__qualname__
-typing.TypeForm
 typing.TypeVar.__mro_entries__
-typing.TypeVarTuple.__bound__
-typing.TypeVarTuple.__contravariant__
-typing.TypeVarTuple.__covariant__
-typing.TypeVarTuple.__infer_variance__
 typing.TypeVarTuple.__mro_entries__
 typing.Union
 typing._SpecialForm.__mro_entries__
-typing.__all__
-typing.disjoint_base
-typing.no_type_check_decorator
+typing_extensions.__all__
 typing_extensions.Protocol
-unicodedata.block
-unicodedata.extended_pictographic
-unicodedata.grapheme_cluster_break
-unicodedata.indic_conjunct_break
-unicodedata.isxidcontinue
-unicodedata.isxidstart
-unicodedata.iter_graphemes
-unittest._log._AssertLogsContext.__init__
-unittest.case.TestCase.assertLogs
-warnings.WarningMessage.__init__
-wave.WAVE_FORMAT_EXTENSIBLE
-wave.WAVE_FORMAT_IEEE_FLOAT
-wave.Wave_read.getformat
-wave.Wave_read.getmark
-wave.Wave_read.getmarkers
-wave.Wave_write.getformat
-wave.Wave_write.getmark
-wave.Wave_write.getmarkers
-wave.Wave_write.setformat
-wave.Wave_write.setmark
-wave.__all__
 xml.etree.ElementTree.__all__
 xml.is_valid_name
 xml.utils
 zipimport.zipimporter.load_module
-zlib.adler32_combine
-zlib.crc32_combine

stdlib/@tests/stubtest_allowlists/win32-py315.txt

@@ -2,7 +2,6 @@
 # TODO: Allowlist entries that should be fixed
 # ============================================
 
-_decimal.SPEC_VERSION
 _socket.IPV6_HDRINCL
 _winapi.DeregisterEventSource
 _winapi.EVENTLOG_AUDIT_FAILURE
@@ -15,7 +14,6 @@ _winapi.GetOEMCP
 _winapi.RegisterEventSource
 _winapi.ReportEvent
 asyncio.windows_events.IocpProactor.finish_socket_func
-decimal.SPEC_VERSION
 socket.IPV6_HDRINCL
 socket.__all__
 winreg.DeleteTree

stdlib/_collections_abc.pyi

@@ -60,8 +60,9 @@ __all__ = [
     "ValuesView",
     "Sequence",
     "MutableSequence",
-    "ByteString",
 ]
+if sys.version_info < (3, 15):
+    __all__ += ["ByteString"]
 if sys.version_info >= (3, 12):
     __all__ += ["Buffer"]
 

stdlib/_decimal.pyi

@@ -25,6 +25,8 @@ _TrapType: TypeAlias = type[DecimalException]
 
 __version__: Final[str]
 __libmpdec_version__: Final[str]
+if sys.version_info >= (3, 15):
+    SPEC_VERSION: Final[str]
 
 ROUND_DOWN: Final = "ROUND_DOWN"
 ROUND_HALF_UP: Final = "ROUND_HALF_UP"

stdlib/_json.pyi

@@ -1,3 +1,4 @@
+import sys
 from collections.abc import Callable
 from typing import Any, final
 from typing_extensions import Self
@@ -36,6 +37,8 @@ class make_encoder:
 
 @final
 class make_scanner:
+    if sys.version_info >= (3, 15):
+        array_hook: Any
     object_hook: Any
     object_pairs_hook: Any
     parse_int: Any
@@ -48,4 +51,9 @@ class make_scanner:
 
 def encode_basestring(s: str, /) -> str: ...
 def encode_basestring_ascii(s: str, /) -> str: ...
-def scanstring(string: str, end: int, strict: bool = True) -> tuple[str, int]: ...
+
+if sys.version_info >= (3, 15):
+    def scanstring(pystr: str, end: int, strict: bool = True, /) -> tuple[str, int]: ...
+
+else:
+    def scanstring(string: str, end: int, strict: bool = True) -> tuple[str, int]: ...

stdlib/_pydecimal.pyi

@@ -45,3 +45,6 @@ __all__ = [
 
 if sys.version_info >= (3, 14):
     __all__ += ["IEEEContext", "IEEE_CONTEXT_MAX_BITS"]
+
+if sys.version_info >= (3, 15):
+    __all__ += ["SPEC_VERSION"]

stdlib/_sqlite3.pyi

@@ -69,6 +69,8 @@ SQLITE_SAVEPOINT: Final = 32
 SQLITE_SELECT: Final = 21
 SQLITE_TRANSACTION: Final = 22
 SQLITE_UPDATE: Final = 23
+if sys.version_info >= (3, 15):
+    SQLITE_KEYWORDS: tuple[str, ...]
 adapters: dict[tuple[type[Any], type[Any]], _Adapter[Any]]
 converters: dict[str, _Converter]
 sqlite_version: str