VimPlug/typeshed
1
0
Fork 0
mirror of https://github.com/davidhalter/typeshed.git synced 2026-05-06 21:43:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[tkinter] Remove _ScreenUnits alias (#14782)

Browse Source 
Inspired by https://github.com/python/typeshed/pull/14742#pullrequestreview-3241268005
This commit is contained in:
Semyon Moroz
2025-09-26 20:42:09 +04:00
committed by GitHub
parent 6af8f287bb
commit fb21402839
3 changed files with 501 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stdlib/tkinter/__init__.pyi
+440 -445
View File
File diff suppressed because it is too large Load Diff
stdlib/tkinter/ttk.pyi
+45 -44
View File
@@ -39,11 +39,12 @@ def tclobjs_to_py(adict: dict[Any, Any]) -> dict[Any, Any]: ...
def setup_master(master: tkinter.Misc | None = None): ...
_Padding: TypeAlias = (
tkinter._ScreenUnits
| tuple[tkinter._ScreenUnits]
| tuple[tkinter._ScreenUnits, tkinter._ScreenUnits]
| tuple[tkinter._ScreenUnits, tkinter._ScreenUnits, tkinter._ScreenUnits]
| tuple[tkinter._ScreenUnits, tkinter._ScreenUnits, tkinter._ScreenUnits, tkinter._ScreenUnits]
float
| str
| tuple[float | str]
| tuple[float | str, float | str]
| tuple[float | str, float | str, float | str]
| tuple[float | str, float | str, float | str, float | str]
)
# from ttk_widget (aka ttk::widget) manual page, differs from compound
@@ -69,10 +70,10 @@ _LayoutSpec: TypeAlias = list[tuple[str, _Layout | None]]
# Keep these in sync with the appropriate methods in Style
class _ElementCreateImageKwargs(TypedDict, total=False):
border: _Padding
height: tkinter._ScreenUnits
height: float | str
padding: _Padding
sticky: str
width: tkinter._ScreenUnits
width: float | str
_ElementCreateArgsCrossPlatform: TypeAlias = (
# Could be any sequence here but types are not homogenous so just type it as tuple
@@ -88,8 +89,8 @@ if sys.platform == "win32" and sys.version_info >= (3, 13):
padding: _Padding
class _ElementCreateVsapiKwargsSize(TypedDict):
width: tkinter._ScreenUnits
height: tkinter._ScreenUnits
width: float | str
height: float | str
_ElementCreateVsapiKwargsDict: TypeAlias = (
_ElementCreateVsapiKwargsPadding | _ElementCreateVsapiKwargsMargin | _ElementCreateVsapiKwargsSize
@@ -143,10 +144,10 @@ class Style:
/,
*imagespec: _ImageStatespec,
border: _Padding = ...,
height: tkinter._ScreenUnits = ...,
height: float | str = ...,
padding: _Padding = ...,
sticky: str = ...,
width: tkinter._ScreenUnits = ...,
width: float | str = ...,
) -> None: ...
@overload
def element_create(self, elementname: str, etype: Literal["from"], themename: str, fromelement: str = ..., /) -> None: ...
@@ -188,8 +189,8 @@ class Style:
vs_statespec: _VsapiStatespec = ...,
/,
*,
width: tkinter._ScreenUnits,
height: tkinter._ScreenUnits,
width: float | str,
height: float | str,
) -> None: ...
def element_names(self) -> tuple[str, ...]: ...
@@ -475,32 +476,32 @@ class Frame(Widget):
self,
master: tkinter.Misc | None = None,
*,
border: tkinter._ScreenUnits = ...,
borderwidth: tkinter._ScreenUnits = ...,
border: float | str = ...,
borderwidth: float | str = ...,
class_: str = "",
cursor: tkinter._Cursor = "",
height: tkinter._ScreenUnits = 0,
height: float | str = 0,
name: str = ...,
padding: _Padding = ...,
relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
style: str = "",
takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
width: tkinter._ScreenUnits = 0,
width: float | str = 0,
) -> None: ...
@overload
def configure(
self,
cnf: dict[str, Any] | None = None,
*,
border: tkinter._ScreenUnits = ...,
borderwidth: tkinter._ScreenUnits = ...,
border: float | str = ...,
borderwidth: float | str = ...,
cursor: tkinter._Cursor = ...,
height: tkinter._ScreenUnits = ...,
height: float | str = ...,
padding: _Padding = ...,
relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
style: str = ...,
takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
width: tkinter._ScreenUnits = ...,
width: float | str = ...,
) -> dict[str, tuple[str, str, str, Any, Any]] | None: ...
@overload
def configure(self, cnf: str) -> tuple[str, str, str, Any, Any]: ...
@@ -513,8 +514,8 @@ class Label(Widget):
*,
anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
background: str = "",
border: tkinter._ScreenUnits = ..., # alias for borderwidth
borderwidth: tkinter._ScreenUnits = ..., # undocumented
border: float | str = ..., # alias for borderwidth
borderwidth: float | str = ..., # undocumented
class_: str = "",
compound: _TtkCompound = "",
cursor: tkinter._Cursor = "",
@@ -532,7 +533,7 @@ class Label(Widget):
textvariable: tkinter.Variable = ...,
underline: int = -1,
width: int | Literal[""] = "",
wraplength: tkinter._ScreenUnits = ...,
wraplength: float | str = ...,
) -> None: ...
@overload
def configure(
@@ -541,8 +542,8 @@ class Label(Widget):
*,
anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"] = ...,
background: str = ...,
border: tkinter._ScreenUnits = ...,
borderwidth: tkinter._ScreenUnits = ...,
border: float | str = ...,
borderwidth: float | str = ...,
compound: _TtkCompound = ...,
cursor: tkinter._Cursor = ...,
font: _FontDescription = ...,
@@ -558,7 +559,7 @@ class Label(Widget):
textvariable: tkinter.Variable = ...,
underline: int = ...,
width: int | Literal[""] = ...,
wraplength: tkinter._ScreenUnits = ...,
wraplength: float | str = ...,
) -> dict[str, tuple[str, str, str, Any, Any]] | None: ...
@overload
def configure(self, cnf: str) -> tuple[str, str, str, Any, Any]: ...
@@ -569,11 +570,11 @@ class Labelframe(Widget):
self,
master: tkinter.Misc | None = None,
*,
border: tkinter._ScreenUnits = ...,
borderwidth: tkinter._ScreenUnits = ..., # undocumented
border: float | str = ...,
borderwidth: float | str = ..., # undocumented
class_: str = "",
cursor: tkinter._Cursor = "",
height: tkinter._ScreenUnits = 0,
height: float | str = 0,
labelanchor: Literal["nw", "n", "ne", "en", "e", "es", "se", "s", "sw", "ws", "w", "wn"] = ...,
labelwidget: tkinter.Misc = ...,
name: str = ...,
@@ -583,17 +584,17 @@ class Labelframe(Widget):
takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
text: float | str = "",
underline: int = -1,
width: tkinter._ScreenUnits = 0,
width: float | str = 0,
) -> None: ...
@overload
def configure(
self,
cnf: dict[str, Any] | None = None,
*,
border: tkinter._ScreenUnits = ...,
borderwidth: tkinter._ScreenUnits = ...,
border: float | str = ...,
borderwidth: float | str = ...,
cursor: tkinter._Cursor = ...,
height: tkinter._ScreenUnits = ...,
height: float | str = ...,
labelanchor: Literal["nw", "n", "ne", "en", "e", "es", "se", "s", "sw", "ws", "w", "wn"] = ...,
labelwidget: tkinter.Misc = ...,
padding: _Padding = ...,
@@ -602,7 +603,7 @@ class Labelframe(Widget):
takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = ...,
text: float | str = ...,
underline: int = ...,
width: tkinter._ScreenUnits = ...,
width: float | str = ...,
) -> dict[str, tuple[str, str, str, Any, Any]] | None: ...
@overload
def configure(self, cnf: str) -> tuple[str, str, str, Any, Any]: ...
@@ -764,7 +765,7 @@ class Progressbar(Widget):
*,
class_: str = "",
cursor: tkinter._Cursor = "",
length: tkinter._ScreenUnits = 100,
length: float | str = 100,
maximum: float = 100,
mode: Literal["determinate", "indeterminate"] = "determinate",
name: str = ...,
@@ -781,7 +782,7 @@ class Progressbar(Widget):
cnf: dict[str, Any] | None = None,
*,
cursor: tkinter._Cursor = ...,
length: tkinter._ScreenUnits = ...,
length: float | str = ...,
maximum: float = ...,
mode: Literal["determinate", "indeterminate"] = ...,
orient: Literal["horizontal", "vertical"] = ...,
@@ -855,7 +856,7 @@ class Scale(Widget, tkinter.Scale): # type: ignore[misc]
command: str | Callable[[str], object] = "",
cursor: tkinter._Cursor = "",
from_: float = 0,
length: tkinter._ScreenUnits = 100,
length: float | str = 100,
name: str = ...,
orient: Literal["horizontal", "vertical"] = "horizontal",
state: str = ..., # undocumented
@@ -873,7 +874,7 @@ class Scale(Widget, tkinter.Scale): # type: ignore[misc]
command: str | Callable[[str], object] = ...,
cursor: tkinter._Cursor = ...,
from_: float = ...,
length: tkinter._ScreenUnits = ...,
length: float | str = ...,
orient: Literal["horizontal", "vertical"] = ...,
state: str = ...,
style: str = ...,
@@ -893,7 +894,7 @@ class Scale(Widget, tkinter.Scale): # type: ignore[misc]
command: str | Callable[[str], object] = ...,
cursor: tkinter._Cursor = ...,
from_: float = ...,
length: tkinter._ScreenUnits = ...,
length: float | str = ...,
orient: Literal["horizontal", "vertical"] = ...,
state: str = ...,
style: str = ...,
@@ -1313,18 +1314,18 @@ class LabeledScale(Frame):
from_: float = 0,
to: float = 10,
*,
border: tkinter._ScreenUnits = ...,
borderwidth: tkinter._ScreenUnits = ...,
border: float | str = ...,
borderwidth: float | str = ...,
class_: str = "",
compound: Literal["top", "bottom"] = "top",
cursor: tkinter._Cursor = "",
height: tkinter._ScreenUnits = 0,
height: float | str = 0,
name: str = ...,
padding: _Padding = ...,
relief: Literal["raised", "sunken", "flat", "ridge", "solid", "groove"] = ...,
style: str = "",
takefocus: bool | Literal[0, 1, ""] | Callable[[str], bool | None] = "",
width: tkinter._ScreenUnits = 0,
width: float | str = 0,
) -> None: ...
# destroy is overridden, signature does not change
value: Any