mirror of
https://github.com/davidhalter/typeshed.git
synced 2026-01-23 19:41:51 +08:00
Big diff: Use new "|" union syntax (#5872)
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import sys
|
||||
import tkinter
|
||||
from typing import Any, Optional, Tuple, Union, overload
|
||||
from typing import Any, Tuple, Union, overload
|
||||
from typing_extensions import Literal, TypedDict
|
||||
|
||||
NORMAL: Literal["normal"]
|
||||
@@ -32,9 +32,9 @@ class Font:
|
||||
self,
|
||||
# In tkinter, 'root' refers to tkinter.Tk by convention, but the code
|
||||
# actually works with any tkinter widget so we use tkinter.Misc.
|
||||
root: Optional[tkinter.Misc] = ...,
|
||||
font: Optional[_FontDescription] = ...,
|
||||
name: Optional[str] = ...,
|
||||
root: tkinter.Misc | None = ...,
|
||||
font: _FontDescription | None = ...,
|
||||
name: str | None = ...,
|
||||
exists: bool = ...,
|
||||
*,
|
||||
family: str = ...,
|
||||
@@ -59,19 +59,19 @@ class Font:
|
||||
def cget(self, option: str) -> Any: ...
|
||||
__getitem__ = cget
|
||||
@overload
|
||||
def actual(self, option: Literal["family"], displayof: Optional[tkinter.Misc] = ...) -> str: ...
|
||||
def actual(self, option: Literal["family"], displayof: tkinter.Misc | None = ...) -> str: ...
|
||||
@overload
|
||||
def actual(self, option: Literal["size"], displayof: Optional[tkinter.Misc] = ...) -> int: ...
|
||||
def actual(self, option: Literal["size"], displayof: tkinter.Misc | None = ...) -> int: ...
|
||||
@overload
|
||||
def actual(self, option: Literal["weight"], displayof: Optional[tkinter.Misc] = ...) -> Literal["normal", "bold"]: ...
|
||||
def actual(self, option: Literal["weight"], displayof: tkinter.Misc | None = ...) -> Literal["normal", "bold"]: ...
|
||||
@overload
|
||||
def actual(self, option: Literal["slant"], displayof: Optional[tkinter.Misc] = ...) -> Literal["roman", "italic"]: ...
|
||||
def actual(self, option: Literal["slant"], displayof: tkinter.Misc | None = ...) -> Literal["roman", "italic"]: ...
|
||||
@overload
|
||||
def actual(self, option: Literal["underline", "overstrike"], displayof: Optional[tkinter.Misc] = ...) -> bool: ...
|
||||
def actual(self, option: Literal["underline", "overstrike"], displayof: tkinter.Misc | None = ...) -> bool: ...
|
||||
@overload
|
||||
def actual(self, option: None, displayof: Optional[tkinter.Misc] = ...) -> _FontDict: ...
|
||||
def actual(self, option: None, displayof: tkinter.Misc | None = ...) -> _FontDict: ...
|
||||
@overload
|
||||
def actual(self, *, displayof: Optional[tkinter.Misc] = ...) -> _FontDict: ...
|
||||
def actual(self, *, displayof: tkinter.Misc | None = ...) -> _FontDict: ...
|
||||
def config(
|
||||
self,
|
||||
*,
|
||||
@@ -81,22 +81,22 @@ class Font:
|
||||
slant: Literal["roman", "italic"] = ...,
|
||||
underline: bool = ...,
|
||||
overstrike: bool = ...,
|
||||
) -> Optional[_FontDict]: ...
|
||||
) -> _FontDict | None: ...
|
||||
configure = config
|
||||
def copy(self) -> Font: ...
|
||||
@overload
|
||||
def metrics(self, __option: Literal["ascent", "descent", "linespace"], *, displayof: Optional[tkinter.Misc] = ...) -> int: ...
|
||||
def metrics(self, __option: Literal["ascent", "descent", "linespace"], *, displayof: tkinter.Misc | None = ...) -> int: ...
|
||||
@overload
|
||||
def metrics(self, __option: Literal["fixed"], *, displayof: Optional[tkinter.Misc] = ...) -> bool: ...
|
||||
def metrics(self, __option: Literal["fixed"], *, displayof: tkinter.Misc | None = ...) -> bool: ...
|
||||
@overload
|
||||
def metrics(self, *, displayof: Optional[tkinter.Misc] = ...) -> _MetricsDict: ...
|
||||
def measure(self, text: str, displayof: Optional[tkinter.Misc] = ...) -> int: ...
|
||||
def metrics(self, *, displayof: tkinter.Misc | None = ...) -> _MetricsDict: ...
|
||||
def measure(self, text: str, displayof: tkinter.Misc | None = ...) -> int: ...
|
||||
|
||||
def families(root: Optional[tkinter.Misc] = ..., displayof: Optional[tkinter.Misc] = ...) -> Tuple[str, ...]: ...
|
||||
def names(root: Optional[tkinter.Misc] = ...) -> Tuple[str, ...]: ...
|
||||
def families(root: tkinter.Misc | None = ..., displayof: tkinter.Misc | None = ...) -> Tuple[str, ...]: ...
|
||||
def names(root: tkinter.Misc | None = ...) -> Tuple[str, ...]: ...
|
||||
|
||||
if sys.version_info >= (3, 10):
|
||||
def nametofont(name: str, root: Optional[tkinter.Misc] = ...) -> Font: ...
|
||||
def nametofont(name: str, root: tkinter.Misc | None = ...) -> Font: ...
|
||||
|
||||
else:
|
||||
def nametofont(name: str) -> Font: ...
|
||||
|
||||
Reference in New Issue
Block a user