Merge branch 'python:main' into update_multiprocessing_managers_BaseListProxy

guoci · web-flow · commit f422c9cb38e0 · 2025-11-24T11:13:18.000-05:00
diff --git a/stdlib/@tests/stubtest_allowlists/py314.txt b/stdlib/@tests/stubtest_allowlists/py314.txt
@@ -41,6 +41,9 @@ concurrent.interpreters._queues.UNBOUND_REMOVE
 
 importlib.util.Loader.exec_module  # See Lib/importlib/_abc.py. Might be defined for backwards compatibility
 
+# Condition functions are exported in __init__
+threading.Condition.locked
+multiprocessing.dummy.Condition.locked
 
 # ====================================
 # Pre-existing errors from Python 3.13
diff --git a/stdlib/mimetypes.pyi b/stdlib/mimetypes.pyi
@@ -25,15 +25,15 @@ if sys.version_info >= (3, 13):
 def guess_type(url: StrPath, strict: bool = True) -> tuple[str | None, str | None]: ...
 def guess_all_extensions(type: str, strict: bool = True) -> list[str]: ...
 def guess_extension(type: str, strict: bool = True) -> str | None: ...
-def init(files: Sequence[str] | None = None) -> None: ...
-def read_mime_types(file: str) -> dict[str, str] | None: ...
+def init(files: Sequence[StrPath] | None = None) -> None: ...
+def read_mime_types(file: StrPath) -> dict[str, str] | None: ...
 def add_type(type: str, ext: str, strict: bool = True) -> None: ...
 
 if sys.version_info >= (3, 13):
     def guess_file_type(path: StrPath, *, strict: bool = True) -> tuple[str | None, str | None]: ...
 
 inited: bool
-knownfiles: list[str]
+knownfiles: list[StrPath]
 suffix_map: dict[str, str]
 encodings_map: dict[str, str]
 types_map: dict[str, str]
@@ -44,12 +44,12 @@ class MimeTypes:
     encodings_map: dict[str, str]
     types_map: tuple[dict[str, str], dict[str, str]]
     types_map_inv: tuple[dict[str, str], dict[str, str]]
-    def __init__(self, filenames: tuple[str, ...] = (), strict: bool = True) -> None: ...
+    def __init__(self, filenames: tuple[StrPath, ...] = (), strict: bool = True) -> None: ...
     def add_type(self, type: str, ext: str, strict: bool = True) -> None: ...
     def guess_extension(self, type: str, strict: bool = True) -> str | None: ...
     def guess_type(self, url: StrPath, strict: bool = True) -> tuple[str | None, str | None]: ...
     def guess_all_extensions(self, type: str, strict: bool = True) -> list[str]: ...
-    def read(self, filename: str, strict: bool = True) -> None: ...
+    def read(self, filename: StrPath, strict: bool = True) -> None: ...
     def readfp(self, fp: IO[str], strict: bool = True) -> None: ...
     def read_windows_registry(self, strict: bool = True) -> None: ...
     if sys.version_info >= (3, 13):
diff --git a/stdlib/sqlite3/__init__.pyi b/stdlib/sqlite3/__init__.pyi
@@ -222,6 +222,7 @@ _AdaptedInputData: TypeAlias = _SqliteData | Any
 _Parameters: TypeAlias = SupportsLenAndGetItem[_AdaptedInputData] | Mapping[str, _AdaptedInputData]
 # Controls the legacy transaction handling mode of sqlite3.
 _IsolationLevel: TypeAlias = Literal["DEFERRED", "EXCLUSIVE", "IMMEDIATE"] | None
+_RowFactoryOptions: TypeAlias = type[Row] | Callable[[Cursor, Row], object] | None
 
 @type_check_only
 class _AnyParamWindowAggregateClass(Protocol):
@@ -300,7 +301,7 @@ class Connection:
         def autocommit(self) -> int: ...
         @autocommit.setter
         def autocommit(self, val: int) -> None: ...
-    row_factory: Any
+    row_factory: _RowFactoryOptions
     text_factory: Any
     if sys.version_info >= (3, 12):
         def __init__(
@@ -416,7 +417,7 @@ class Cursor:
     def description(self) -> tuple[tuple[str, None, None, None, None, None, None], ...] | MaybeNone: ...
     @property
     def lastrowid(self) -> int | None: ...
-    row_factory: Callable[[Cursor, Row], object] | None
+    row_factory: _RowFactoryOptions
     @property
     def rowcount(self) -> int: ...
     def __init__(self, cursor: Connection, /) -> None: ...
diff --git a/stdlib/threading.pyi b/stdlib/threading.pyi
@@ -144,6 +144,9 @@ class Condition:
     ) -> None: ...
     def acquire(self, blocking: bool = True, timeout: float = -1) -> bool: ...
     def release(self) -> None: ...
+    if sys.version_info >= (3, 14):
+        def locked(self) -> bool: ...
+
     def wait(self, timeout: float | None = None) -> bool: ...
     def wait_for(self, predicate: Callable[[], _T], timeout: float | None = None) -> _T: ...
     def notify(self, n: int = 1) -> None: ...
diff --git a/stdlib/unittest/mock.pyi b/stdlib/unittest/mock.pyi
@@ -199,6 +199,7 @@ class NonCallableMock(Base, Any):
     call_count: int
     call_args: _Call | MaybeNone
     call_args_list: _CallList
+    method_calls: _CallList
     mock_calls: _CallList
     def _format_mock_call_signature(self, args: Any, kwargs: Any) -> str: ...
     def _call_matcher(self, _call: tuple[_Call, ...]) -> _Call: ...
diff --git a/stubs/psutil/@tests/stubtest_allowlist.txt b/stubs/psutil/@tests/stubtest_allowlist.txt
@@ -5,6 +5,9 @@ psutil.__all__
 psutil._psaix
 psutil._psbsd
 psutil._pssunos
+psutil._psutil_aix
+psutil._psutil_bsd
+psutil._psutil_sunos
 
 # Test utilities
 psutil.tests.*
diff --git a/stubs/psutil/@tests/stubtest_allowlist_darwin.txt b/stubs/psutil/@tests/stubtest_allowlist_darwin.txt
@@ -1,7 +1,7 @@
 psutil._pslinux
+psutil._pswindows
 psutil._psutil_linux
 psutil._psutil_windows
-psutil._pswindows
 
 # not always available on ARM64, but we test there
 psutil.cpu_freq
diff --git a/stubs/psutil/@tests/stubtest_allowlist_linux.txt b/stubs/psutil/@tests/stubtest_allowlist_linux.txt
@@ -1,4 +1,4 @@
 psutil._psosx
-psutil._psutil_windows
-psutil._psutil_osx
 psutil._pswindows
+psutil._psutil_osx
+psutil._psutil_windows
diff --git a/stubs/psutil/@tests/stubtest_allowlist_win32.txt b/stubs/psutil/@tests/stubtest_allowlist_win32.txt
@@ -1,5 +1,4 @@
-psutil._pslinux
 psutil._psosx
-psutil._psutil_linux
+psutil._pslinux
 psutil._psutil_osx
-psutil._psutil_posix
+psutil._psutil_linux
diff --git a/stubs/psutil/METADATA.toml b/stubs/psutil/METADATA.toml
@@ -1,4 +1,4 @@
-version = "7.1.1"
+version = "7.1.3"
 upstream_repository = "https://github.com/giampaolo/psutil"
 
 [tool.stubtest]
diff --git a/stubs/psutil/psutil/_psbsd.pyi b/stubs/psutil/psutil/_psbsd.pyi
@@ -111,7 +111,6 @@ INIT_BOOT_TIME: float
 def adjust_proc_create_time(ctime: float) -> float: ...
 def pids(): ...
 def pid_exists(pid): ...
-def is_zombie(pid): ...
 def wrap_exceptions(fun): ...
 def wrap_exceptions_procfs(inst) -> AbstractContextManager[None]: ...
 
diff --git a/stubs/psutil/psutil/_psosx.pyi b/stubs/psutil/psutil/_psosx.pyi
@@ -18,7 +18,7 @@ if sys.platform == "darwin":
         usage_percent as usage_percent,
     )
 
-    from . import _common, _psposix, _psutil_osx, _psutil_posix
+    from . import _common, _psposix, _psutil_osx
 
     _P = ParamSpec("_P")
     _R = TypeVar("_R")
@@ -75,7 +75,7 @@ if sys.platform == "darwin":
     def sensors_battery() -> _common.sbattery | None: ...
 
     net_io_counters = _psutil_osx.net_io_counters
-    net_if_addrs = _psutil_posix.net_if_addrs
+    net_if_addrs = _psutil_osx.net_if_addrs
     def net_connections(kind: str = "inet") -> list[_common.sconn]: ...
     def net_if_stats() -> dict[str, _common.snicstats]: ...
     def boot_time() -> float: ...
@@ -85,7 +85,6 @@ if sys.platform == "darwin":
     def pids() -> list[int]: ...
     pid_exists = _psposix.pid_exists
     def wrap_exceptions(fun: Callable[_P, _R]) -> Callable[_P, _R]: ...
-    def is_zombie(pid: int) -> bool: ...
 
     class Process:
         __slots__ = ["_cache", "_name", "_ppid", "pid"]
diff --git a/stubs/psutil/psutil/_psutil_aix.pyi b/stubs/psutil/psutil/_psutil_aix.pyi
@@ -0,0 +1,53 @@
+from _typeshed import Incomplete
+
+# TODO: Add POSIX constants and check their aviability (see psutil_posix_add_constants)
+AF_LINK: Incomplete
+
+def getpagesize() -> int: ...
+def net_if_addrs(): ...
+def net_if_flags(nic_name: str, /) -> list[str]: ...
+def net_if_is_running(nic_name: str, /) -> bool: ...
+def net_if_mtu(nic_name: str, /) -> int: ...
+def proc_priority_get(pid: int, /) -> int: ...
+def proc_priority_set(pid: int, priority: int, /) -> None: ...
+
+version: Incomplete
+SIDL: Incomplete
+SZOMB: Incomplete
+SACTIVE: Incomplete
+SSWAP: Incomplete
+SSTOP: Incomplete
+TCPS_CLOSED: Incomplete
+TCPS_CLOSING: Incomplete
+TCPS_CLOSE_WAIT: Incomplete
+TCPS_LISTEN: Incomplete
+TCPS_ESTABLISHED: Incomplete
+TCPS_SYN_SENT: Incomplete
+TCPS_SYN_RCVD: Incomplete
+TCPS_FIN_WAIT_1: Incomplete
+TCPS_FIN_WAIT_2: Incomplete
+TCPS_LAST_ACK: Incomplete
+TCPS_TIME_WAIT: Incomplete
+PSUTIL_CONN_NONE: Incomplete
+
+def proc_args(pid: int, /) -> list[str]: ...
+def proc_basic_info(pid: int, procfs_path: str, /): ...
+def proc_cpu_times(pid: int, procfs_path: str, /): ...
+def proc_cred(pid: int, procfs_path: str, /): ...
+def proc_environ(pid: int, /): ...
+def proc_name(pid: int, procfs_path: str, /): ...
+def proc_threads(pid: int, /): ...
+def proc_io_counters(pid: int, /): ...
+def proc_num_ctx_switches(requested_pid: int, /): ...
+def boot_time(): ...
+def disk_io_counters(): ...
+def disk_partitions(): ...
+def per_cpu_times(): ...
+def swap_mem(): ...
+def virtual_mem(): ...
+def net_io_counters(): ...
+def cpu_stats(): ...
+def net_connections(requested_pid: int, /): ...
+def net_if_stats(nic_name: str, /): ...
+def check_pid_range(pid: int, /) -> None: ...
+def set_debug(value: bool, /) -> None: ...
diff --git a/stubs/psutil/psutil/_psutil_bsd.pyi b/stubs/psutil/psutil/_psutil_bsd.pyi
@@ -0,0 +1,73 @@
+from _typeshed import Incomplete
+
+# TODO: Add POSIX constants and check their aviability (see psutil_posix_add_constants)
+AF_LINK: Incomplete
+
+def getpagesize() -> int: ...
+def net_if_addrs(): ...
+def net_if_flags(nic_name: str, /) -> list[str]: ...
+def net_if_is_running(nic_name: str, /) -> bool: ...
+def net_if_mtu(nic_name: str, /) -> int: ...
+def proc_priority_get(pid: int, /) -> int: ...
+def proc_priority_set(pid: int, priority: int, /) -> None: ...
+def net_if_duplex_speed(nic_name: str, /): ...
+def proc_is_zombie(pid: int, /) -> bool: ...
+
+SIDL: Incomplete
+SRUN: Incomplete
+SSLEEP: Incomplete
+SSTOP: Incomplete
+SZOMB: Incomplete
+SWAIT: Incomplete  # only FreeBSD
+SLOCK: Incomplete  # only FreeBSD
+SDEAD: Incomplete  # only OpenBSD and NetBSD
+SONPROC: Incomplete  # only OpenBSD and NetBSD
+SSUSPENDED: Incomplete  # only NetBSD
+TCPS_CLOSED: Incomplete
+TCPS_CLOSING: Incomplete
+TCPS_CLOSE_WAIT: Incomplete
+TCPS_LISTEN: Incomplete
+TCPS_ESTABLISHED: Incomplete
+TCPS_SYN_SENT: Incomplete
+TCPS_SYN_RECEIVED: Incomplete
+TCPS_FIN_WAIT_1: Incomplete
+TCPS_FIN_WAIT_2: Incomplete
+TCPS_LAST_ACK: Incomplete
+TCPS_TIME_WAIT: Incomplete
+PSUTIL_CONN_NONE: Incomplete
+
+def proc_cmdline(*args, **kwargs): ...
+def proc_cwd(*args, **kwargs): ...
+def proc_environ(*args, **kwargs): ...
+def proc_name(*args, **kwargs): ...
+def proc_num_fds(*args, **kwargs): ...
+def proc_oneshot_info(*args, **kwargs): ...
+def proc_open_files(*args, **kwargs): ...
+def proc_threads(*args, **kwargs): ...
+def proc_num_threads(*args, **kwargs): ...  # only FreeBSD and OpenBSD
+def proc_cpu_affinity_get(*args, **kwargs): ...  # only FreeBSD
+def proc_cpu_affinity_set(*args, **kwargs): ...  # only FreeBSD
+def proc_exe(*args, **kwargs): ...  # only FreeBSD
+def proc_getrlimit(*args, **kwargs): ...  # only FreeBSD
+def proc_memory_maps(*args, **kwargs): ...  # only FreeBSD
+def proc_net_connections(*args, **kwargs): ...  # only FreeBSD
+def proc_setrlimit(*args, **kwargs): ...  # only FreeBSD
+def boot_time(*args, **kwargs): ...
+def cpu_count_logical(*args, **kwargs): ...
+def cpu_stats(*args, **kwargs): ...
+def cpu_times(*args, **kwargs): ...
+def disk_io_counters(*args, **kwargs): ...
+def disk_partitions(*args, **kwargs): ...
+def net_connections(*args, **kwargs): ...
+def net_io_counters(*args, **kwargs): ...
+def per_cpu_times(*args, **kwargs): ...
+def pids(*args, **kwargs): ...
+def swap_mem(*args, **kwargs): ...
+def users(*args, **kwargs): ...
+def virtual_mem(*args, **kwargs): ...
+def cpu_freq(*args, **kwargs): ...  # only FreeBSD and OpenBSD
+def cpu_topology(*args, **kwargs): ...  # only FreeBSD
+def sensors_battery(*args, **kwargs): ...  # only FreeBSD
+def sensors_cpu_temperature(*args, **kwargs): ...  # only FreeBSD
+def check_pid_range(*args, **kwargs): ...
+def set_debug(*args, **kwargs): ...
diff --git a/stubs/psutil/psutil/_psutil_linux.pyi b/stubs/psutil/psutil/_psutil_linux.pyi
@@ -1,14 +1,45 @@
+from _typeshed import Incomplete
+from typing import Final
+
+# TODO: Add POSIX constants and check their aviability (see psutil_posix_add_constants)
+RLIM_INFINITY: Final[int]
+RLIMIT_AS: Final[int]
+RLIMIT_CORE: Final[int]
+RLIMIT_CPU: Final[int]
+RLIMIT_DATA: Final[int]
+RLIMIT_FSIZE: Final[int]
+RLIMIT_LOCKS: Final[int]
+RLIMIT_MEMLOCK: Final[int]
+RLIMIT_MSGQUEUE: Final[int]
+RLIMIT_NICE: Final[int]
+RLIMIT_NOFILE: Final[int]
+RLIMIT_NPROC: Final[int]
+RLIMIT_RSS: Final[int]
+RLIMIT_RTPRIO: Final[int]
+RLIMIT_RTTIME: Final[int]
+RLIMIT_SIGPENDING: Final[int]
+RLIMIT_STACK: Final[int]
+
+def getpagesize() -> int: ...
+def net_if_addrs(): ...
+def net_if_flags(nic_name: str, /) -> list[str]: ...
+def net_if_is_running(nic_name: str, /) -> bool: ...
+def net_if_mtu(nic_name: str, /) -> int: ...
+def proc_priority_get(pid: int, /) -> int: ...
+def proc_priority_set(pid: int, priority: int, /) -> None: ...
+def users() -> list[tuple[Incomplete, ...]]: ...
+
+version: int
 DUPLEX_FULL: int
 DUPLEX_HALF: int
 DUPLEX_UNKNOWN: int
-version: int
 
-def check_pid_range(pid: int, /) -> None: ...
-def disk_partitions(*args, **kwargs): ...
-def linux_sysinfo(*args, **kwargs): ...
-def net_if_duplex_speed(*args, **kwargs): ...
-def proc_cpu_affinity_get(*args, **kwargs): ...
-def proc_cpu_affinity_set(*args, **kwargs): ...
-def proc_ioprio_get(*args, **kwargs): ...
+def proc_ioprio_get(pid: int, /): ...
 def proc_ioprio_set(*args, **kwargs): ...
-def set_debug(*args, **kwargs): ...
+def proc_cpu_affinity_get(pid: int, /): ...
+def proc_cpu_affinity_set(*args, **kwargs): ...
+def disk_partitions(mtab_path: str, /): ...
+def net_if_duplex_speed(nic_name: str, /): ...
+def linux_sysinfo() -> tuple[int, int, int, int, int, int, int]: ...
+def check_pid_range(pid: int, /) -> None: ...
+def set_debug(value: bool, /) -> None: ...
diff --git a/stubs/psutil/psutil/_psutil_osx.pyi b/stubs/psutil/psutil/_psutil_osx.pyi
@@ -1,13 +1,27 @@
 import sys
 
 if sys.platform == "darwin":
-    from _typeshed import StrOrBytesPath
+    from _typeshed import Incomplete, StrOrBytesPath
     from collections.abc import Sequence
     from socket import AddressFamily, SocketKind
     from typing import Final, TypeVar
 
     _T = TypeVar("_T")
 
+    # TODO: Add POSIX constants and check their aviability (see psutil_posix_add_constants)
+    AF_LINK: Incomplete
+
+    def getpagesize() -> int: ...
+    def net_if_addrs(): ...
+    def net_if_flags(nic_name: str, /) -> list[str]: ...
+    def net_if_is_running(nic_name: str, /) -> bool: ...
+    def net_if_mtu(nic_name: str, /) -> int: ...
+    def proc_priority_get(pid: int, /) -> int: ...
+    def proc_priority_set(pid: int, priority: int, /) -> None: ...
+    def net_if_duplex_speed(nic_name: str, /): ...
+    def users() -> list[tuple[Incomplete, ...]]: ...
+    def proc_is_zombie(pid: int, /) -> bool: ...
+
     version: Final[int]
     SIDL: Final = 1
     SRUN: Final = 2
diff --git a/stubs/psutil/psutil/_psutil_posix.pyi b/stubs/psutil/psutil/_psutil_posix.pyi
diff --git a/stubs/psutil/psutil/_psutil_sunos.pyi b/stubs/psutil/psutil/_psutil_sunos.pyi

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = "7.1.1"`
	`1`	`+version = "7.1.3"`
`2`	`2`	`upstream_repository = "https://github.com/giampaolo/psutil"`
`3`	`3`
`4`	`4`	`[tool.stubtest]`