Merge branch 'main' into set_sub

Author: randolf-scholz

lib/ts_utils/utils.py

@@ -35,6 +35,16 @@ def strip_comments(text: str) -> str:
     return text.split("#")[0].strip()
 
 
+def json5_to_json(text: str) -> str:
+    """Incomplete conversion from JSON5-like input to valid JSON."""
+    # Remove full-line // comments only
+    # (Can not remove inline comments)
+    text = re.sub(r"(?m)^\s*//.*\n?", "", text)
+    # Remove trailing commas before } or ]
+    text = re.sub(r",\s*([}\]])", r"\1", text)
+    return text
+
+
 # ====================================================================
 # Printing utilities
 # ====================================================================

pyrightconfig.stricter.json

@@ -9,16 +9,16 @@
         // test cases use a custom pyrightconfig file
         "**/@tests/test_cases",
         "stdlib/__main__.pyi",
+        "stdlib/_tkinter.pyi",
         "stdlib/distutils/cmd.pyi",
         "stdlib/distutils/command",
         "stdlib/distutils/dist.pyi",
         "stdlib/encodings/__init__.pyi",
         "stdlib/lib2to3/fixes/*.pyi",
         "stdlib/numbers.pyi",
-        "stdlib/_tkinter.pyi",
         "stdlib/tkinter/__init__.pyi",
-        "stdlib/tkinter/filedialog.pyi",
         "stdlib/tkinter/dialog.pyi",
+        "stdlib/tkinter/filedialog.pyi",
         "stdlib/tkinter/scrolledtext.pyi",
         "stdlib/tkinter/tix.pyi",
         "stdlib/tkinter/ttk.pyi",
@@ -74,6 +74,7 @@
         "stubs/protobuf",
         "stubs/psutil/psutil/__init__.pyi",
         "stubs/psycopg2",
+        "stubs/punq",
         "stubs/pyasn1",
         "stubs/pycurl",
         "stubs/Pygments",

stdlib/@tests/test_cases/itertools/check_batched.py

@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+import sys
+from typing_extensions import assert_type
+
+if sys.version_info >= (3, 13):
+    from itertools import batched
+
+    assert_type(batched([0], 1, strict=True), batched[tuple[int]])
+    assert_type(batched([0, 0], 2, strict=True), batched[tuple[int, int]])
+    assert_type(batched([0, 0, 0], 3, strict=True), batched[tuple[int, int, int]])
+    assert_type(batched([0, 0, 0, 0], 4, strict=True), batched[tuple[int, int, int, int]])
+    assert_type(batched([0, 0, 0, 0, 0], 5, strict=True), batched[tuple[int, int, int, int, int]])
+
+    assert_type(batched([0], 2), batched[tuple[int, ...]])
+    assert_type(batched([0], 2, strict=False), batched[tuple[int, ...]])
+
+    def f() -> int:
+        return 3
+
+    assert_type(batched([0, 0, 0], f(), strict=True), batched[tuple[int, ...]])

stdlib/_tkinter.pyi

@@ -1,6 +1,7 @@
 import sys
+from _typeshed import FileDescriptorLike, Incomplete
 from collections.abc import Callable
-from typing import Any, ClassVar, Final, final
+from typing import Any, ClassVar, Final, Literal, final, overload
 from typing_extensions import TypeAlias, deprecated
 
 # _tkinter is meant to be only used internally by tkinter, but some tkinter
@@ -54,22 +55,23 @@ _TkinterTraceFunc: TypeAlias = Callable[[tuple[str, ...]], object]
 @final
 class TkappType:
     # Please keep in sync with tkinter.Tk
-    def adderrorinfo(self, msg: str, /): ...
+    def adderrorinfo(self, msg: str, /) -> None: ...
     def call(self, command: Any, /, *args: Any) -> Any: ...
-    def createcommand(self, name: str, func, /): ...
+    # TODO: Figure out what arguments the following `func` callbacks should accept
+    def createcommand(self, name: str, func: Callable[..., object], /) -> None: ...
     if sys.platform != "win32":
-        def createfilehandler(self, file, mask: int, func, /): ...
-        def deletefilehandler(self, file, /) -> None: ...
+        def createfilehandler(self, file: FileDescriptorLike, mask: int, func: Callable[..., object], /) -> None: ...
+        def deletefilehandler(self, file: FileDescriptorLike, /) -> None: ...
 
-    def createtimerhandler(self, milliseconds: int, func, /): ...
-    def deletecommand(self, name: str, /): ...
-    def dooneevent(self, flags: int = 0, /): ...
+    def createtimerhandler(self, milliseconds: int, func: Callable[..., object], /): ...
+    def deletecommand(self, name: str, /) -> None: ...
+    def dooneevent(self, flags: int = 0, /) -> int: ...
     def eval(self, script: str, /) -> str: ...
-    def evalfile(self, fileName: str, /): ...
-    def exprboolean(self, s: str, /): ...
-    def exprdouble(self, s: str, /): ...
-    def exprlong(self, s: str, /): ...
-    def exprstring(self, s: str, /): ...
+    def evalfile(self, fileName: str, /) -> str: ...
+    def exprboolean(self, s: str, /) -> Literal[0, 1]: ...
+    def exprdouble(self, s: str, /) -> float: ...
+    def exprlong(self, s: str, /) -> int: ...
+    def exprstring(self, s: str, /) -> str: ...
     def getboolean(self, arg, /) -> bool: ...
     def getdouble(self, arg, /) -> float: ...
     def getint(self, arg, /) -> int: ...
@@ -81,15 +83,23 @@ class TkappType:
     def loadtk(self) -> None: ...
     def mainloop(self, threshold: int = 0, /) -> None: ...
     def quit(self) -> None: ...
-    def record(self, script: str, /): ...
+    def record(self, script: str, /) -> str: ...
     def setvar(self, *ags, **kwargs): ...
     if sys.version_info < (3, 11):
         @deprecated("Deprecated since Python 3.9; removed in Python 3.11. Use `splitlist()` instead.")
         def split(self, arg, /): ...
 
-    def splitlist(self, arg, /): ...
+    def splitlist(self, arg, /) -> tuple[Incomplete, ...]: ...
     def unsetvar(self, *args, **kwargs): ...
-    def wantobjects(self, *args, **kwargs): ...
+    if sys.version_info >= (3, 14):
+        @overload
+        def wantobjects(self) -> Literal[0, 1]: ...
+    else:
+        @overload
+        def wantobjects(self) -> bool: ...
+
+    @overload
+    def wantobjects(self, wantobjects: Literal[0, 1] | bool, /) -> None: ...
     def willdispatch(self) -> None: ...
     if sys.version_info >= (3, 12):
         def gettrace(self, /) -> _TkinterTraceFunc | None: ...
@@ -112,7 +122,7 @@ TK_VERSION: Final[str]
 
 @final
 class TkttType:
-    def deletetimerhandler(self): ...
+    def deletetimerhandler(self) -> None: ...
 
 if sys.version_info >= (3, 13):
     def create(
@@ -125,7 +135,7 @@ if sys.version_info >= (3, 13):
         sync: bool = False,
         use: str | None = None,
         /,
-    ): ...
+    ) -> TkappType: ...
 
 else:
     def create(
@@ -138,7 +148,7 @@ else:
         sync: bool = False,
         use: str | None = None,
         /,
-    ): ...
+    ) -> TkappType: ...
 
 def getbusywaitinterval() -> int: ...
 def setbusywaitinterval(new_val: int, /) -> None: ...

stdlib/builtins.pyi

@@ -1176,9 +1176,9 @@ class dict(MutableMapping[_KT, _VT]):
     # __init__ should be kept roughly in line with `collections.UserDict.__init__`, which has similar semantics
     # Also multiprocessing.managers.SyncManager.dict()
     @overload
-    def __init__(self) -> None: ...
+    def __init__(self, /) -> None: ...
     @overload
-    def __init__(self: dict[str, _VT], **kwargs: _VT) -> None: ...  # pyright: ignore[reportInvalidTypeVarUse]  #11780
+    def __init__(self: dict[str, _VT], /, **kwargs: _VT) -> None: ...  # pyright: ignore[reportInvalidTypeVarUse]  #11780
     @overload
     def __init__(self, map: SupportsKeysAndGetItem[_KT, _VT], /) -> None: ...
     @overload
@@ -1203,7 +1203,7 @@ class dict(MutableMapping[_KT, _VT]):
     def __init__(self: dict[str, str], iterable: Iterable[list[str]], /) -> None: ...
     @overload
     def __init__(self: dict[bytes, bytes], iterable: Iterable[list[bytes]], /) -> None: ...
-    def __new__(cls, *args: Any, **kwargs: Any) -> Self: ...
+    def __new__(cls, /, *args: Any, **kwargs: Any) -> Self: ...
     def copy(self) -> dict[_KT, _VT]: ...
     def keys(self) -> dict_keys[_KT, _VT]: ...
     def values(self) -> dict_values[_KT, _VT]: ...

stdlib/cmath.pyi

@@ -9,6 +9,7 @@ nan: Final[float]
 nanj: Final[complex]
 tau: Final[float]
 
+_F: TypeAlias = SupportsFloat | SupportsIndex
 _C: TypeAlias = SupportsFloat | SupportsComplex | SupportsIndex | complex
 
 def acos(z: _C, /) -> complex: ...
@@ -27,7 +28,7 @@ def log(z: _C, base: _C = ..., /) -> complex: ...
 def log10(z: _C, /) -> complex: ...
 def phase(z: _C, /) -> float: ...
 def polar(z: _C, /) -> tuple[float, float]: ...
-def rect(r: float, phi: float, /) -> complex: ...
+def rect(r: _F, phi: _F, /) -> complex: ...
 def sin(z: _C, /) -> complex: ...
 def sinh(z: _C, /) -> complex: ...
 def sqrt(z: _C, /) -> complex: ...

stdlib/ctypes/__init__.pyi

@@ -169,11 +169,12 @@ def create_unicode_buffer(init: int | str, size: int | None = None) -> Array[c_w
 if sys.version_info >= (3, 13):
     @deprecated("Deprecated since Python 3.13; will be removed in Python 3.15.")
     def SetPointerType(pointer: type[_Pointer[Any]], cls: _CTypeBaseType) -> None: ...
+    @deprecated("Soft deprecated since Python 3.13. Use multiplication instead.")
+    def ARRAY(typ: _CT, len: int) -> Array[_CT]: ...
 
 else:
     def SetPointerType(pointer: type[_Pointer[Any]], cls: _CTypeBaseType) -> None: ...
-
-def ARRAY(typ: _CT, len: int) -> Array[_CT]: ...  # Soft Deprecated, no plans to remove
+    def ARRAY(typ: _CT, len: int) -> Array[_CT]: ...
 
 if sys.platform == "win32":
     def DllCanUnloadNow() -> int: ...

stdlib/email/utils.pyi

@@ -44,16 +44,7 @@ def parsedate(data: str) -> tuple[int, int, int, int, int, int, int, int, int] |
 def parsedate_tz(data: None) -> None: ...
 @overload
 def parsedate_tz(data: str) -> _PDTZ | None: ...
-
-if sys.version_info >= (3, 10):
-    @overload
-    def parsedate_to_datetime(data: None) -> None: ...
-    @overload
-    def parsedate_to_datetime(data: str) -> datetime.datetime: ...
-
-else:
-    def parsedate_to_datetime(data: str) -> datetime.datetime: ...
-
+def parsedate_to_datetime(data: str) -> datetime.datetime: ...
 def mktime_tz(data: _PDTZ) -> int: ...
 def formatdate(timeval: float | None = None, localtime: bool = False, usegmt: bool = False) -> str: ...
 def format_datetime(dt: datetime.datetime, usegmt: bool = False) -> str: ...

stdlib/faulthandler.pyi

@@ -3,21 +3,23 @@ from _typeshed import FileDescriptorLike
 
 def cancel_dump_traceback_later() -> None: ...
 def disable() -> None: ...
-def dump_traceback(file: FileDescriptorLike = ..., all_threads: bool = ...) -> None: ...
+def dump_traceback(file: FileDescriptorLike = sys.stderr, all_threads: bool = True) -> None: ...
 
 if sys.version_info >= (3, 14):
-    def dump_c_stack(file: FileDescriptorLike = ...) -> None: ...
+    def dump_c_stack(file: FileDescriptorLike = sys.stderr) -> None: ...
 
-def dump_traceback_later(timeout: float, repeat: bool = ..., file: FileDescriptorLike = ..., exit: bool = ...) -> None: ...
+def dump_traceback_later(
+    timeout: float, repeat: bool = False, file: FileDescriptorLike = sys.stderr, exit: bool = False
+) -> None: ...
 
 if sys.version_info >= (3, 14):
-    def enable(file: FileDescriptorLike = ..., all_threads: bool = ..., c_stack: bool = True) -> None: ...
+    def enable(file: FileDescriptorLike = sys.stderr, all_threads: bool = True, c_stack: bool = True) -> None: ...
 
 else:
-    def enable(file: FileDescriptorLike = ..., all_threads: bool = ...) -> None: ...
+    def enable(file: FileDescriptorLike = sys.stderr, all_threads: bool = True) -> None: ...
 
 def is_enabled() -> bool: ...
 
 if sys.platform != "win32":
-    def register(signum: int, file: FileDescriptorLike = ..., all_threads: bool = ..., chain: bool = ...) -> None: ...
+    def register(signum: int, file: FileDescriptorLike = sys.stderr, all_threads: bool = True, chain: bool = False) -> None: ...
     def unregister(signum: int, /) -> None: ...

stdlib/ftplib.pyi

@@ -1,11 +1,11 @@
 import sys
-from _typeshed import SupportsRead, SupportsReadline
+from _typeshed import StrOrBytesPath, SupportsRead, SupportsReadline
 from collections.abc import Callable, Iterable, Iterator
 from socket import socket
 from ssl import SSLContext
 from types import TracebackType
-from typing import Any, Final, Literal, TextIO
-from typing_extensions import Self
+from typing import Any, Final, Literal, TextIO, overload
+from typing_extensions import Self, deprecated
 
 __all__ = ["FTP", "error_reply", "error_temp", "error_perm", "error_proto", "all_errors", "FTP_TLS"]
 
@@ -120,23 +120,43 @@ class FTP_TLS(FTP):
             encoding: str = "utf-8",
         ) -> None: ...
     else:
+        @overload
         def __init__(
             self,
             host: str = "",
             user: str = "",
             passwd: str = "",
             acct: str = "",
-            keyfile: str | None = None,
-            certfile: str | None = None,
+            keyfile: None = None,
+            certfile: None = None,
             context: SSLContext | None = None,
             timeout: float | None = ...,
             source_address: tuple[str, int] | None = None,
             *,
             encoding: str = "utf-8",
         ) -> None: ...
-    ssl_version: int
-    keyfile: str | None
-    certfile: str | None
+        @overload
+        @deprecated(
+            "The `keyfile`, `certfile` parameters are deprecated since Python 3.6; "
+            "removed in Python 3.12. Use `context` parameter instead."
+        )
+        def __init__(
+            self,
+            host: str = "",
+            user: str = "",
+            passwd: str = "",
+            acct: str = "",
+            keyfile: StrOrBytesPath | None = None,
+            certfile: StrOrBytesPath | None = None,
+            context: None = None,
+            timeout: float | None = ...,
+            source_address: tuple[str, int] | None = None,
+            *,
+            encoding: str = "utf-8",
+        ) -> None: ...
+        ssl_version: int
+        keyfile: StrOrBytesPath | None
+        certfile: StrOrBytesPath | None
     context: SSLContext
     def login(self, user: str = "", passwd: str = "", acct: str = "", secure: bool = True) -> str: ...
     def auth(self) -> str: ...