Skip to content

Commit 7d2ab73

Browse files
committed
Delete tkinter.Grid.content, tkinter.Pack.content and tkinter.Place.content
1 parent 148b3c2 commit 7d2ab73

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

stdlib/@tests/stubtest_allowlists/py315.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,3 +224,8 @@ profiling.sampling.heatmap_collector.TreeNode
224224
profiling.sampling.module_utils
225225
profiling.sampling.opcode_utils
226226
profiling.sampling.sample
227+
228+
# These conflicting aliases are just like tkinter.*.slaves in common.txt.
229+
tkinter.Grid.content
230+
tkinter.Pack.content
231+
tkinter.Place.content

stdlib/tkinter/__init__.pyi

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,6 @@ 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-
content = pack_content
638637
slaves = pack_slaves
639638
def event_add(self, virtual: str, *sequences: str) -> None: ...
640639
def event_delete(self, virtual: str, *sequences: str) -> None: ...
@@ -1113,7 +1112,6 @@ class Pack:
11131112
def pack_info(self) -> _PackInfo: ... # errors if widget hasn't been packed
11141113
if sys.version_info >= (3, 15):
11151114
def pack_content(self) -> list[Widget]: ...
1116-
content = pack_content
11171115
pack = pack_configure
11181116
forget = pack_forget
11191117
propagate = Misc.pack_propagate
@@ -1154,7 +1152,6 @@ class Place:
11541152
def place_info(self) -> _PlaceInfo: ...
11551153
if sys.version_info >= (3, 15):
11561154
def place_content(self) -> list[Widget]: ...
1157-
content = place_content
11581155
place = place_configure
11591156
info = place_info
11601157

@@ -1206,7 +1203,7 @@ class BaseWidget(Misc):
12061203
def destroy(self) -> None: ...
12071204

12081205
# This class represents any widget except Toplevel or Tk.
1209-
class Widget(BaseWidget, Pack, Place, Grid): # type: ignore[misc] # content aliases differ across geometry mixins.
1206+
class Widget(BaseWidget, Pack, Place, Grid):
12101207
# Allow bind callbacks to take e.g. Event[Label] instead of Event[Misc].
12111208
# Tk and Toplevel get notified for their child widgets' events, but other
12121209
# widgets don't.
@@ -1378,7 +1375,7 @@ class Button(Widget):
13781375
def flash(self) -> None: ...
13791376
def invoke(self) -> Any: ...
13801377

1381-
class Canvas(Widget, XView, YView): # type: ignore[misc] # content aliases differ across geometry mixins.
1378+
class Canvas(Widget, XView, YView):
13821379
def __init__(
13831380
self,
13841381
master: Misc | None = None,
@@ -2148,7 +2145,7 @@ class Checkbutton(Widget):
21482145
def select(self) -> None: ...
21492146
def toggle(self) -> None: ...
21502147

2151-
class Entry(Widget, XView): # type: ignore[misc] # content aliases differ across geometry mixins.
2148+
class Entry(Widget, XView):
21522149
def __init__(
21532150
self,
21542151
master: Misc | None = None,
@@ -2391,7 +2388,7 @@ class Label(Widget):
23912388
def configure(self, cnf: str) -> tuple[str, str, str, Any, Any]: ...
23922389
config = configure
23932390

2394-
class Listbox(Widget, XView, YView): # type: ignore[misc] # content aliases differ across geometry mixins.
2391+
class Listbox(Widget, XView, YView):
23952392
def __init__(
23962393
self,
23972394
master: Misc | None = None,
@@ -3193,7 +3190,7 @@ _WhatToCount: TypeAlias = Literal[
31933190
"chars", "displaychars", "displayindices", "displaylines", "indices", "lines", "xpixels", "ypixels"
31943191
]
31953192

3196-
class Text(Widget, XView, YView): # type: ignore[misc] # content aliases differ across geometry mixins.
3193+
class Text(Widget, XView, YView):
31973194
def __init__(
31983195
self,
31993196
master: Misc | None = None,
@@ -3981,7 +3978,7 @@ class BitmapImage(Image, _BitmapImageLike):
39813978
def image_names() -> tuple[str, ...]: ...
39823979
def image_types() -> tuple[str, ...]: ...
39833980

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

0 commit comments

Comments
 (0)