From 279a361114ce7fad9a61091de0b489e249a7967c Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Tue, 4 Jun 2024 10:20:24 +0200 Subject: [PATCH 1/5] Deprecate `logging.getLevelName(str)` See https://docs.python.org/3/library/logging.html#logging.getLevelName --- stdlib/logging/__init__.pyi | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/stdlib/logging/__init__.pyi b/stdlib/logging/__init__.pyi index f25abff837b7..8401de292e01 100644 --- a/stdlib/logging/__init__.pyi +++ b/stdlib/logging/__init__.pyi @@ -8,7 +8,7 @@ from string import Template from time import struct_time from types import FrameType, TracebackType from typing import Any, ClassVar, Generic, Literal, Protocol, TextIO, TypeVar, overload -from typing_extensions import Self, TypeAlias +from typing_extensions import Self, TypeAlias, deprecated if sys.version_info >= (3, 11): from types import GenericAlias @@ -574,10 +574,8 @@ def disable(level: int = 50) -> None: ... def addLevelName(level: int, levelName: str) -> None: ... @overload def getLevelName(level: int) -> str: ... - -# The str -> int case is considered a mistake, but retained for backward -# compatibility. See -# https://docs.python.org/3/library/logging.html#logging.getLevelName. +@overload +@deprecated("The str -> int case is considered a mistake.") @overload def getLevelName(level: str) -> Any: ... From f7255312587e1752ca63ba68521918b8f32b7921 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Tue, 4 Jun 2024 10:32:22 +0200 Subject: [PATCH 2/5] Remove second overload for primer checks --- stdlib/logging/__init__.pyi | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/stdlib/logging/__init__.pyi b/stdlib/logging/__init__.pyi index 8401de292e01..b755d17e15d1 100644 --- a/stdlib/logging/__init__.pyi +++ b/stdlib/logging/__init__.pyi @@ -572,12 +572,13 @@ fatal = critical def disable(level: int = 50) -> None: ... def addLevelName(level: int, levelName: str) -> None: ... -@overload + +# @overload def getLevelName(level: int) -> str: ... -@overload -@deprecated("The str -> int case is considered a mistake.") -@overload -def getLevelName(level: str) -> Any: ... + +# @overload +# @deprecated("The str -> int case is considered a mistake.") +# def getLevelName(level: str) -> Any: ... if sys.version_info >= (3, 11): def getLevelNamesMapping() -> dict[str, int]: ... From bbfb4fd52224633bc5e88aba8da1eb5addba05b6 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 08:34:05 +0000 Subject: [PATCH 3/5] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stdlib/logging/__init__.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/logging/__init__.pyi b/stdlib/logging/__init__.pyi index b755d17e15d1..33af79f970b6 100644 --- a/stdlib/logging/__init__.pyi +++ b/stdlib/logging/__init__.pyi @@ -8,7 +8,7 @@ from string import Template from time import struct_time from types import FrameType, TracebackType from typing import Any, ClassVar, Generic, Literal, Protocol, TextIO, TypeVar, overload -from typing_extensions import Self, TypeAlias, deprecated +from typing_extensions import Self, TypeAlias if sys.version_info >= (3, 11): from types import GenericAlias From e2583a46346c744820a47cb394c3ad3bcc36077e Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Tue, 4 Jun 2024 10:47:23 +0200 Subject: [PATCH 4/5] Restore overloads, fix duplicate overload --- stdlib/logging/__init__.pyi | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/stdlib/logging/__init__.pyi b/stdlib/logging/__init__.pyi index 33af79f970b6..dac8bb0e691d 100644 --- a/stdlib/logging/__init__.pyi +++ b/stdlib/logging/__init__.pyi @@ -572,13 +572,11 @@ fatal = critical def disable(level: int = 50) -> None: ... def addLevelName(level: int, levelName: str) -> None: ... - -# @overload +@overload def getLevelName(level: int) -> str: ... - -# @overload -# @deprecated("The str -> int case is considered a mistake.") -# def getLevelName(level: str) -> Any: ... +@overload +@deprecated("The str -> int case is considered a mistake.") +def getLevelName(level: str) -> Any: ... if sys.version_info >= (3, 11): def getLevelNamesMapping() -> dict[str, int]: ... From 8ca4cf78c9737a454d4bb313d58063aeed9d53ee Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Tue, 4 Jun 2024 10:47:50 +0200 Subject: [PATCH 5/5] Restore import --- stdlib/logging/__init__.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/logging/__init__.pyi b/stdlib/logging/__init__.pyi index dac8bb0e691d..4c6163257236 100644 --- a/stdlib/logging/__init__.pyi +++ b/stdlib/logging/__init__.pyi @@ -8,7 +8,7 @@ from string import Template from time import struct_time from types import FrameType, TracebackType from typing import Any, ClassVar, Generic, Literal, Protocol, TextIO, TypeVar, overload -from typing_extensions import Self, TypeAlias +from typing_extensions import Self, TypeAlias, deprecated if sys.version_info >= (3, 11): from types import GenericAlias