Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions stdlib/@tests/stubtest_allowlists/py315.txt
Original file line number Diff line number Diff line change
Expand Up @@ -224,3 +224,8 @@ profiling.sampling.heatmap_collector.TreeNode
profiling.sampling.module_utils
profiling.sampling.opcode_utils
profiling.sampling.sample

# These conflicting aliases are just like tkinter.*.slaves in common.txt.
tkinter.Grid.content
tkinter.Pack.content
tkinter.Place.content
18 changes: 8 additions & 10 deletions stdlib/tkinter/__init__.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -630,12 +630,13 @@ class Misc:
def pack_slaves(self) -> list[Widget]: ...
def grid_slaves(self, row: int | None = None, column: int | None = None) -> list[Widget]: ...
def place_slaves(self) -> list[Widget]: ...
slaves = pack_slaves
if sys.version_info >= (3, 15):
def pack_content(self) -> list[Widget]: ...
def grid_content(self, row: int | None = None, column: int | None = None) -> list[Widget]: ...
def place_content(self) -> list[Widget]: ...
content = pack_content
slaves = pack_slaves

def event_add(self, virtual: str, *sequences: str) -> None: ...
def event_delete(self, virtual: str, *sequences: str) -> None: ...
def event_generate(
Expand Down Expand Up @@ -1113,7 +1114,6 @@ class Pack:
def pack_info(self) -> _PackInfo: ... # errors if widget hasn't been packed
if sys.version_info >= (3, 15):
def pack_content(self) -> list[Widget]: ...
content = pack_content
pack = pack_configure
forget = pack_forget
propagate = Misc.pack_propagate
Expand Down Expand Up @@ -1154,7 +1154,6 @@ class Place:
def place_info(self) -> _PlaceInfo: ...
if sys.version_info >= (3, 15):
def place_content(self) -> list[Widget]: ...
content = place_content
place = place_configure
info = place_info

Expand Down Expand Up @@ -1194,7 +1193,6 @@ class Grid:
def grid_info(self) -> _GridInfo: ...
if sys.version_info >= (3, 15):
def grid_content(self, row: int | None = None, column: int | None = None) -> list[Widget]: ...
content = grid_content
grid = grid_configure
location = Misc.grid_location
size = Misc.grid_size
Expand All @@ -1206,7 +1204,7 @@ class BaseWidget(Misc):
def destroy(self) -> None: ...

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

class Canvas(Widget, XView, YView): # type: ignore[misc] # content aliases differ across geometry mixins.
class Canvas(Widget, XView, YView):
def __init__(
self,
master: Misc | None = None,
Expand Down Expand Up @@ -2148,7 +2146,7 @@ class Checkbutton(Widget):
def select(self) -> None: ...
def toggle(self) -> None: ...

class Entry(Widget, XView): # type: ignore[misc] # content aliases differ across geometry mixins.
class Entry(Widget, XView):
def __init__(
self,
master: Misc | None = None,
Expand Down Expand Up @@ -2391,7 +2389,7 @@ class Label(Widget):
def configure(self, cnf: str) -> tuple[str, str, str, Any, Any]: ...
config = configure

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

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

class Spinbox(Widget, XView): # type: ignore[misc] # content aliases differ across geometry mixins.
class Spinbox(Widget, XView):
def __init__(
self,
master: Misc | None = None,
Expand Down
6 changes: 3 additions & 3 deletions stdlib/tkinter/ttk.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ class Checkbutton(Widget):
config = configure
def invoke(self) -> Any: ...

class Entry(Widget, tkinter.Entry): # type: ignore[misc] # content aliases differ across geometry mixins.
class Entry(Widget, tkinter.Entry):
def __init__(
self,
master: tkinter.Misc | None = None,
Expand Down Expand Up @@ -718,7 +718,7 @@ class Notebook(Widget):
def tabs(self): ...
def enable_traversal(self) -> None: ...

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

class Treeview(Widget, tkinter.XView, tkinter.YView): # type: ignore[misc] # content aliases differ across geometry mixins.
class Treeview(Widget, tkinter.XView, tkinter.YView):
def __init__(
self,
master: tkinter.Misc | None = None,
Expand Down
Loading