From caa4250fc8cf52e463aa94f0b0fe7ff1cbf1cf13 Mon Sep 17 00:00:00 2001 From: Jelle Zijlstra Date: Fri, 6 May 2022 20:46:05 -0700 Subject: [PATCH 1/3] tkinter: add info_patchlevel for 3.11 python/cpython#91829 --- stdlib/tkinter/__init__.pyi | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/stdlib/tkinter/__init__.pyi b/stdlib/tkinter/__init__.pyi index dfd99b88c91a..a2e0005b4c1b 100644 --- a/stdlib/tkinter/__init__.pyi +++ b/stdlib/tkinter/__init__.pyi @@ -6,7 +6,7 @@ from enum import Enum from tkinter.constants import * from tkinter.font import _FontDescription from types import TracebackType -from typing import Any, Generic, Protocol, TypeVar, Union, overload +from typing import Any, Generic, NamedTuple, Protocol, TypeVar, Union, overload from typing_extensions import Literal, TypeAlias, TypedDict if sys.version_info >= (3, 9): @@ -198,6 +198,14 @@ _ScreenUnits: TypeAlias = str | float # Often the right type instead of int. Ma _XYScrollCommand: TypeAlias = str | Callable[[float, float], Any] # -xscrollcommand and -yscrollcommand in 'options' manual page _TakeFocusValue: TypeAlias = Union[int, Literal[""], Callable[[str], bool | None]] # -takefocus in manual page named 'options' +if sys.version_info >= (3, 11): + class _VersionInfoType(NamedTuple): + major: int + minor: int + micro: int + releaselevel: str + serial: int + class EventType(str, Enum): Activate: str ButtonPress: str @@ -377,6 +385,8 @@ class Misc: def lower(self, belowThis: Any | None = ...) -> None: ... def tkraise(self, aboveThis: Any | None = ...) -> None: ... lift = tkraise + if sys.version_info >= (3, 11): + def info_patchlevel(self) -> VersionInfoType: ... def winfo_atom(self, name: str, displayof: Literal[0] | Misc | None = ...) -> int: ... def winfo_atomname(self, id: int, displayof: Literal[0] | Misc | None = ...) -> str: ... def winfo_cells(self) -> int: ... From efa64cedb5cb2f3343879a0a1208e1f66f1ec4bf Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 7 May 2022 03:47:27 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stdlib/tkinter/__init__.pyi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stdlib/tkinter/__init__.pyi b/stdlib/tkinter/__init__.pyi index a2e0005b4c1b..981fa9473802 100644 --- a/stdlib/tkinter/__init__.pyi +++ b/stdlib/tkinter/__init__.pyi @@ -205,7 +205,7 @@ if sys.version_info >= (3, 11): micro: int releaselevel: str serial: int - + class EventType(str, Enum): Activate: str ButtonPress: str @@ -387,6 +387,7 @@ class Misc: lift = tkraise if sys.version_info >= (3, 11): def info_patchlevel(self) -> VersionInfoType: ... + def winfo_atom(self, name: str, displayof: Literal[0] | Misc | None = ...) -> int: ... def winfo_atomname(self, id: int, displayof: Literal[0] | Misc | None = ...) -> str: ... def winfo_cells(self) -> int: ... From 97d57a52b9ab3a1a09436c69897b355269e5b006 Mon Sep 17 00:00:00 2001 From: Jelle Zijlstra Date: Fri, 6 May 2022 20:52:00 -0700 Subject: [PATCH 3/3] fix typo --- stdlib/tkinter/__init__.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/tkinter/__init__.pyi b/stdlib/tkinter/__init__.pyi index 981fa9473802..f73cdd86fd5e 100644 --- a/stdlib/tkinter/__init__.pyi +++ b/stdlib/tkinter/__init__.pyi @@ -386,7 +386,7 @@ class Misc: def tkraise(self, aboveThis: Any | None = ...) -> None: ... lift = tkraise if sys.version_info >= (3, 11): - def info_patchlevel(self) -> VersionInfoType: ... + def info_patchlevel(self) -> _VersionInfoType: ... def winfo_atom(self, name: str, displayof: Literal[0] | Misc | None = ...) -> int: ... def winfo_atomname(self, id: int, displayof: Literal[0] | Misc | None = ...) -> str: ...