Skip to content

Commit 3a46217

Browse files
authored
Delete tkinter.{Grid,Pack,Place}.content (#15763)
1 parent 346d4bd commit 3a46217

3 files changed

Lines changed: 16 additions & 13 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: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -630,12 +630,13 @@ class Misc:
630630
def pack_slaves(self) -> list[Widget]: ...
631631
def grid_slaves(self, row: int | None = None, column: int | None = None) -> list[Widget]: ...
632632
def place_slaves(self) -> list[Widget]: ...
633+
slaves = pack_slaves
633634
if sys.version_info >= (3, 15):
634635
def pack_content(self) -> list[Widget]: ...
635636
def grid_content(self, row: int | None = None, column: int | None = None) -> list[Widget]: ...
636637
def place_content(self) -> list[Widget]: ...
637638
content = pack_content
638-
slaves = pack_slaves
639+
639640
def event_add(self, virtual: str, *sequences: str) -> None: ...
640641
def event_delete(self, virtual: str, *sequences: str) -> None: ...
641642
def event_generate(
@@ -1113,7 +1114,6 @@ class Pack:
11131114
def pack_info(self) -> _PackInfo: ... # errors if widget hasn't been packed
11141115
if sys.version_info >= (3, 15):
11151116
def pack_content(self) -> list[Widget]: ...
1116-
content = pack_content
11171117
pack = pack_configure
11181118
forget = pack_forget
11191119
propagate = Misc.pack_propagate
@@ -1154,7 +1154,6 @@ class Place:
11541154
def place_info(self) -> _PlaceInfo: ...
11551155
if sys.version_info >= (3, 15):
11561156
def place_content(self) -> list[Widget]: ...
1157-
content = place_content
11581157
place = place_configure
11591158
info = place_info
11601159

@@ -1194,7 +1193,6 @@ class Grid:
11941193
def grid_info(self) -> _GridInfo: ...
11951194
if sys.version_info >= (3, 15):
11961195
def grid_content(self, row: int | None = None, column: int | None = None) -> list[Widget]: ...
1197-
content = grid_content
11981196
grid = grid_configure
11991197
location = Misc.grid_location
12001198
size = Misc.grid_size
@@ -1206,7 +1204,7 @@ class BaseWidget(Misc):
12061204
def destroy(self) -> None: ...
12071205

12081206
# 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.
1207+
class Widget(BaseWidget, Pack, Place, Grid):
12101208
# Allow bind callbacks to take e.g. Event[Label] instead of Event[Misc].
12111209
# Tk and Toplevel get notified for their child widgets' events, but other
12121210
# widgets don't.
@@ -1378,7 +1376,7 @@ class Button(Widget):
13781376
def flash(self) -> None: ...
13791377
def invoke(self) -> Any: ...
13801378

1381-
class Canvas(Widget, XView, YView): # type: ignore[misc] # content aliases differ across geometry mixins.
1379+
class Canvas(Widget, XView, YView):
13821380
def __init__(
13831381
self,
13841382
master: Misc | None = None,
@@ -2148,7 +2146,7 @@ class Checkbutton(Widget):
21482146
def select(self) -> None: ...
21492147
def toggle(self) -> None: ...
21502148

2151-
class Entry(Widget, XView): # type: ignore[misc] # content aliases differ across geometry mixins.
2149+
class Entry(Widget, XView):
21522150
def __init__(
21532151
self,
21542152
master: Misc | None = None,
@@ -2391,7 +2389,7 @@ class Label(Widget):
23912389
def configure(self, cnf: str) -> tuple[str, str, str, Any, Any]: ...
23922390
config = configure
23932391

2394-
class Listbox(Widget, XView, YView): # type: ignore[misc] # content aliases differ across geometry mixins.
2392+
class Listbox(Widget, XView, YView):
23952393
def __init__(
23962394
self,
23972395
master: Misc | None = None,
@@ -3193,7 +3191,7 @@ _WhatToCount: TypeAlias = Literal[
31933191
"chars", "displaychars", "displayindices", "displaylines", "indices", "lines", "xpixels", "ypixels"
31943192
]
31953193

3196-
class Text(Widget, XView, YView): # type: ignore[misc] # content aliases differ across geometry mixins.
3194+
class Text(Widget, XView, YView):
31973195
def __init__(
31983196
self,
31993197
master: Misc | None = None,
@@ -3981,7 +3979,7 @@ class BitmapImage(Image, _BitmapImageLike):
39813979
def image_names() -> tuple[str, ...]: ...
39823980
def image_types() -> tuple[str, ...]: ...
39833981

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

stdlib/tkinter/ttk.pyi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ class Checkbutton(Widget):
316316
config = configure
317317
def invoke(self) -> Any: ...
318318

319-
class Entry(Widget, tkinter.Entry): # type: ignore[misc] # content aliases differ across geometry mixins.
319+
class Entry(Widget, tkinter.Entry):
320320
def __init__(
321321
self,
322322
master: tkinter.Misc | None = None,
@@ -718,7 +718,7 @@ class Notebook(Widget):
718718
def tabs(self): ...
719719
def enable_traversal(self) -> None: ...
720720

721-
class Panedwindow(Widget, tkinter.PanedWindow): # type: ignore[misc] # content aliases differ across geometry mixins.
721+
class Panedwindow(Widget, tkinter.PanedWindow):
722722
def __init__(
723723
self,
724724
master: tkinter.Misc | None = None,
@@ -1106,7 +1106,7 @@ class _TreeviewColumnDict(TypedDict):
11061106
anchor: Literal["nw", "n", "ne", "w", "center", "e", "sw", "s", "se"]
11071107
id: str
11081108

1109-
class Treeview(Widget, tkinter.XView, tkinter.YView): # type: ignore[misc] # content aliases differ across geometry mixins.
1109+
class Treeview(Widget, tkinter.XView, tkinter.YView):
11101110
def __init__(
11111111
self,
11121112
master: tkinter.Misc | None = None,

0 commit comments

Comments
 (0)