From 30c83ab5e049eff51f3dbbac6578249c8b1b218f Mon Sep 17 00:00:00 2001 From: Akuli Date: Sun, 2 May 2021 18:52:09 +0300 Subject: [PATCH] tkinter.font nametofont root arg py3.10 (#5307) Fixes #5306 --- stdlib/tkinter/font.pyi | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/stdlib/tkinter/font.pyi b/stdlib/tkinter/font.pyi index 81eacd507..a19c2dd6d 100644 --- a/stdlib/tkinter/font.pyi +++ b/stdlib/tkinter/font.pyi @@ -1,3 +1,4 @@ +import sys import tkinter from typing import Any, List, Optional, Tuple, TypeVar, Union, overload from typing_extensions import Literal, TypedDict @@ -7,8 +8,6 @@ ROMAN: Literal["roman"] BOLD: Literal["bold"] ITALIC: Literal["italic"] -def nametofont(name: str) -> Font: ... - # Can contain e.g. nested sequences ('FONT DESCRIPTIONS' in font man page) _FontDescription = Union[str, Font, tkinter._TkinterSequence[Any]] @@ -95,3 +94,9 @@ class Font: def families(root: Optional[tkinter.Misc] = ..., displayof: Optional[tkinter.Misc] = ...) -> Tuple[str, ...]: ... def names(root: Optional[tkinter.Misc] = ...) -> Tuple[str, ...]: ... + +if sys.version_info >= (3, 10): + def nametofont(name: str, root: Optional[tkinter.Misc] = ...) -> Font: ... + +else: + def nametofont(name: str) -> Font: ...