Skip to content

Commit fd37712

Browse files
committed
Use exact tkinter content signatures
1 parent ec6e688 commit fd37712

1 file changed

Lines changed: 10 additions & 14 deletions

File tree

stdlib/tkinter/__init__.pyi

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -634,8 +634,7 @@ class Misc:
634634
def pack_content(self) -> list[Widget]: ...
635635
def grid_content(self, row: int | None = None, column: int | None = None) -> list[Widget]: ...
636636
def place_content(self) -> list[Widget]: ...
637-
# Runtime aliases this to pack_content/grid_content/place_content depending on the mixin class.
638-
def content(self, *args: Any, **kwargs: Any) -> list[Widget]: ...
637+
content = pack_content
639638
slaves = pack_slaves
640639
def event_add(self, virtual: str, *sequences: str) -> None: ...
641640
def event_delete(self, virtual: str, *sequences: str) -> None: ...
@@ -1114,8 +1113,7 @@ class Pack:
11141113
def pack_info(self) -> _PackInfo: ... # errors if widget hasn't been packed
11151114
if sys.version_info >= (3, 15):
11161115
def pack_content(self) -> list[Widget]: ...
1117-
# Runtime aliases this to pack_content/grid_content/place_content depending on the mixin class.
1118-
def content(self, *args: Any, **kwargs: Any) -> list[Widget]: ...
1116+
content = pack_content
11191117
pack = pack_configure
11201118
forget = pack_forget
11211119
propagate = Misc.pack_propagate
@@ -1156,8 +1154,7 @@ class Place:
11561154
def place_info(self) -> _PlaceInfo: ...
11571155
if sys.version_info >= (3, 15):
11581156
def place_content(self) -> list[Widget]: ...
1159-
# Runtime aliases this to pack_content/grid_content/place_content depending on the mixin class.
1160-
def content(self, *args: Any, **kwargs: Any) -> list[Widget]: ...
1157+
content = place_content
11611158
place = place_configure
11621159
info = place_info
11631160

@@ -1197,8 +1194,7 @@ class Grid:
11971194
def grid_info(self) -> _GridInfo: ...
11981195
if sys.version_info >= (3, 15):
11991196
def grid_content(self, row: int | None = None, column: int | None = None) -> list[Widget]: ...
1200-
# Runtime aliases this to pack_content/grid_content/place_content depending on the mixin class.
1201-
def content(self, *args: Any, **kwargs: Any) -> list[Widget]: ...
1197+
content = grid_content
12021198
grid = grid_configure
12031199
location = Misc.grid_location
12041200
size = Misc.grid_size
@@ -1210,7 +1206,7 @@ class BaseWidget(Misc):
12101206
def destroy(self) -> None: ...
12111207

12121208
# This class represents any widget except Toplevel or Tk.
1213-
class Widget(BaseWidget, Pack, Place, Grid):
1209+
class Widget(BaseWidget, Pack, Place, Grid): # type: ignore[misc] # content aliases differ across geometry mixins.
12141210
# Allow bind callbacks to take e.g. Event[Label] instead of Event[Misc].
12151211
# Tk and Toplevel get notified for their child widgets' events, but other
12161212
# widgets don't.
@@ -1382,7 +1378,7 @@ class Button(Widget):
13821378
def flash(self) -> None: ...
13831379
def invoke(self) -> Any: ...
13841380

1385-
class Canvas(Widget, XView, YView):
1381+
class Canvas(Widget, XView, YView): # type: ignore[misc] # content aliases differ across geometry mixins.
13861382
def __init__(
13871383
self,
13881384
master: Misc | None = None,
@@ -2152,7 +2148,7 @@ class Checkbutton(Widget):
21522148
def select(self) -> None: ...
21532149
def toggle(self) -> None: ...
21542150

2155-
class Entry(Widget, XView):
2151+
class Entry(Widget, XView): # type: ignore[misc] # content aliases differ across geometry mixins.
21562152
def __init__(
21572153
self,
21582154
master: Misc | None = None,
@@ -2395,7 +2391,7 @@ class Label(Widget):
23952391
def configure(self, cnf: str) -> tuple[str, str, str, Any, Any]: ...
23962392
config = configure
23972393

2398-
class Listbox(Widget, XView, YView):
2394+
class Listbox(Widget, XView, YView): # type: ignore[misc] # content aliases differ across geometry mixins.
23992395
def __init__(
24002396
self,
24012397
master: Misc | None = None,
@@ -3197,7 +3193,7 @@ _WhatToCount: TypeAlias = Literal[
31973193
"chars", "displaychars", "displayindices", "displaylines", "indices", "lines", "xpixels", "ypixels"
31983194
]
31993195

3200-
class Text(Widget, XView, YView):
3196+
class Text(Widget, XView, YView): # type: ignore[misc] # content aliases differ across geometry mixins.
32013197
def __init__(
32023198
self,
32033199
master: Misc | None = None,
@@ -3985,7 +3981,7 @@ class BitmapImage(Image, _BitmapImageLike):
39853981
def image_names() -> tuple[str, ...]: ...
39863982
def image_types() -> tuple[str, ...]: ...
39873983

3988-
class Spinbox(Widget, XView):
3984+
class Spinbox(Widget, XView): # type: ignore[misc] # content aliases differ across geometry mixins.
39893985
def __init__(
39903986
self,
39913987
master: Misc | None = None,

0 commit comments

Comments
 (0)