From 9a81c099a544169f3abd692fbb5d8b863248a3a5 Mon Sep 17 00:00:00 2001 From: crusaderky Date: Mon, 3 Oct 2022 13:46:39 +0100 Subject: [PATCH 1/6] psutil.get_io_counters() can return None --- stubs/psutil/psutil/__init__.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/psutil/psutil/__init__.pyi b/stubs/psutil/psutil/__init__.pyi index 2330710a228f..756d802634b5 100644 --- a/stubs/psutil/psutil/__init__.pyi +++ b/stubs/psutil/psutil/__init__.pyi @@ -225,7 +225,7 @@ def virtual_memory() -> svmem: ... def swap_memory() -> sswap: ... def disk_usage(path: str) -> sdiskusage: ... def disk_partitions(all: bool = ...) -> list[sdiskpart]: ... -def disk_io_counters(perdisk: bool = ..., nowrap: bool = ...) -> sdiskio: ... +def disk_io_counters(perdisk: bool = ..., nowrap: bool = ...) -> sdiskio | None: ... def net_io_counters(pernic: bool = ..., nowrap: bool = ...) -> snetio: ... def net_connections(kind: str = ...) -> list[sconn]: ... def net_if_addrs() -> dict[str, list[snicaddr]]: ... From 3ca6af6696c1f8a3ae6db9fe53ea716d7075f94e Mon Sep 17 00:00:00 2001 From: crusaderky Date: Mon, 3 Oct 2022 13:53:27 +0100 Subject: [PATCH 2/6] overload perdisk and pernic --- stubs/psutil/psutil/__init__.pyi | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/stubs/psutil/psutil/__init__.pyi b/stubs/psutil/psutil/__init__.pyi index 756d802634b5..db2b38b44449 100644 --- a/stubs/psutil/psutil/__init__.pyi +++ b/stubs/psutil/psutil/__init__.pyi @@ -2,7 +2,7 @@ import sys from _typeshed import Self from collections.abc import Callable, Iterable, Iterator from contextlib import AbstractContextManager -from typing import Any +from typing import Any, overload from typing_extensions import Literal, TypeAlias from ._common import ( @@ -225,8 +225,17 @@ def virtual_memory() -> svmem: ... def swap_memory() -> sswap: ... def disk_usage(path: str) -> sdiskusage: ... def disk_partitions(all: bool = ...) -> list[sdiskpart]: ... -def disk_io_counters(perdisk: bool = ..., nowrap: bool = ...) -> sdiskio | None: ... -def net_io_counters(pernic: bool = ..., nowrap: bool = ...) -> snetio: ... + +@overload +def disk_io_counters(perdisk: Literal[False] = False, nowrap: bool = ...) -> sdiskio | None: ... +@overload +def disk_io_counters(perdisk: Literal[True], *, nowrap: bool = ...) -> dict[str, sdiskio]: ... + +@overload +def net_io_counters(pernic: Literal[False] = False, nowrap: bool = ...) -> snetio: ... +@overload +def net_io_counters(pernic: Literal[True], *, nowrap: bool = ...) -> dict[str, snetio]: ... + def net_connections(kind: str = ...) -> list[sconn]: ... def net_if_addrs() -> dict[str, list[snicaddr]]: ... def net_if_stats() -> dict[str, snicstats]: ... From 5b454e0e01a520b6425554c48a54216c62c30896 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 12:54:38 +0000 Subject: [PATCH 3/6] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stubs/psutil/psutil/__init__.pyi | 3 --- 1 file changed, 3 deletions(-) diff --git a/stubs/psutil/psutil/__init__.pyi b/stubs/psutil/psutil/__init__.pyi index db2b38b44449..650ee52516d6 100644 --- a/stubs/psutil/psutil/__init__.pyi +++ b/stubs/psutil/psutil/__init__.pyi @@ -225,17 +225,14 @@ def virtual_memory() -> svmem: ... def swap_memory() -> sswap: ... def disk_usage(path: str) -> sdiskusage: ... def disk_partitions(all: bool = ...) -> list[sdiskpart]: ... - @overload def disk_io_counters(perdisk: Literal[False] = False, nowrap: bool = ...) -> sdiskio | None: ... @overload def disk_io_counters(perdisk: Literal[True], *, nowrap: bool = ...) -> dict[str, sdiskio]: ... - @overload def net_io_counters(pernic: Literal[False] = False, nowrap: bool = ...) -> snetio: ... @overload def net_io_counters(pernic: Literal[True], *, nowrap: bool = ...) -> dict[str, snetio]: ... - def net_connections(kind: str = ...) -> list[sconn]: ... def net_if_addrs() -> dict[str, list[snicaddr]]: ... def net_if_stats() -> dict[str, snicstats]: ... From 4a8f8248875adcef2dae812eb5a493b1e0ac20eb Mon Sep 17 00:00:00 2001 From: crusaderky Date: Mon, 3 Oct 2022 13:55:51 +0100 Subject: [PATCH 4/6] remove keyword-only --- stubs/psutil/psutil/__init__.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stubs/psutil/psutil/__init__.pyi b/stubs/psutil/psutil/__init__.pyi index db2b38b44449..2b73030a7224 100644 --- a/stubs/psutil/psutil/__init__.pyi +++ b/stubs/psutil/psutil/__init__.pyi @@ -229,12 +229,12 @@ def disk_partitions(all: bool = ...) -> list[sdiskpart]: ... @overload def disk_io_counters(perdisk: Literal[False] = False, nowrap: bool = ...) -> sdiskio | None: ... @overload -def disk_io_counters(perdisk: Literal[True], *, nowrap: bool = ...) -> dict[str, sdiskio]: ... +def disk_io_counters(perdisk: Literal[True], nowrap: bool = ...) -> dict[str, sdiskio]: ... @overload def net_io_counters(pernic: Literal[False] = False, nowrap: bool = ...) -> snetio: ... @overload -def net_io_counters(pernic: Literal[True], *, nowrap: bool = ...) -> dict[str, snetio]: ... +def net_io_counters(pernic: Literal[True], nowrap: bool = ...) -> dict[str, snetio]: ... def net_connections(kind: str = ...) -> list[sconn]: ... def net_if_addrs() -> dict[str, list[snicaddr]]: ... From 74854ae0b9f22cd6181556848ef50e075111ee76 Mon Sep 17 00:00:00 2001 From: crusaderky Date: Mon, 3 Oct 2022 13:56:19 +0100 Subject: [PATCH 5/6] f --- stubs/psutil/psutil/__init__.pyi | 2 -- 1 file changed, 2 deletions(-) diff --git a/stubs/psutil/psutil/__init__.pyi b/stubs/psutil/psutil/__init__.pyi index ed95201a9d5b..088ff58f42ce 100644 --- a/stubs/psutil/psutil/__init__.pyi +++ b/stubs/psutil/psutil/__init__.pyi @@ -229,12 +229,10 @@ def disk_partitions(all: bool = ...) -> list[sdiskpart]: ... def disk_io_counters(perdisk: Literal[False] = False, nowrap: bool = ...) -> sdiskio | None: ... @overload def disk_io_counters(perdisk: Literal[True], nowrap: bool = ...) -> dict[str, sdiskio]: ... - @overload def net_io_counters(pernic: Literal[False] = False, nowrap: bool = ...) -> snetio: ... @overload def net_io_counters(pernic: Literal[True], nowrap: bool = ...) -> dict[str, snetio]: ... - def net_connections(kind: str = ...) -> list[sconn]: ... def net_if_addrs() -> dict[str, list[snicaddr]]: ... def net_if_stats() -> dict[str, snicstats]: ... From 37d466f46166dd872682f85fc10e7fd1730dba30 Mon Sep 17 00:00:00 2001 From: crusaderky Date: Mon, 3 Oct 2022 14:49:08 +0100 Subject: [PATCH 6/6] lint --- stubs/psutil/psutil/__init__.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stubs/psutil/psutil/__init__.pyi b/stubs/psutil/psutil/__init__.pyi index 088ff58f42ce..2ffb5465f150 100644 --- a/stubs/psutil/psutil/__init__.pyi +++ b/stubs/psutil/psutil/__init__.pyi @@ -226,11 +226,11 @@ def swap_memory() -> sswap: ... def disk_usage(path: str) -> sdiskusage: ... def disk_partitions(all: bool = ...) -> list[sdiskpart]: ... @overload -def disk_io_counters(perdisk: Literal[False] = False, nowrap: bool = ...) -> sdiskio | None: ... +def disk_io_counters(perdisk: Literal[False] = ..., nowrap: bool = ...) -> sdiskio | None: ... @overload def disk_io_counters(perdisk: Literal[True], nowrap: bool = ...) -> dict[str, sdiskio]: ... @overload -def net_io_counters(pernic: Literal[False] = False, nowrap: bool = ...) -> snetio: ... +def net_io_counters(pernic: Literal[False] = ..., nowrap: bool = ...) -> snetio: ... @overload def net_io_counters(pernic: Literal[True], nowrap: bool = ...) -> dict[str, snetio]: ... def net_connections(kind: str = ...) -> list[sconn]: ...