Replace Incomplete | None = None in stdlib (#14083)

2026-05-06 21:43:59 +08:00 · 2025-05-16 15:43:52 +02:00
parent 5785616f7a
commit 0125fe2848
12 changed files with 50 additions and 62 deletions
@@ -312,7 +312,7 @@ class Event(Generic[_W_co]):
 def NoDefaultRoot() -> None: ...

 class Variable:
-    def __init__(self, master: Misc | None = None, value: Incomplete | None = None, name: str | None = None) -> None: ...
+    def __init__(self, master: Misc | None = None, value=None, name: str | None = None) -> None: ...
    def set(self, value) -> None: ...
    initialize = set
    def get(self): ...
@@ -379,7 +379,7 @@ class Misc:
    children: dict[str, Widget]
    def destroy(self) -> None: ...
    def deletecommand(self, name: str) -> None: ...
-    def tk_strictMotif(self, boolean: Incomplete | None = None): ...
+    def tk_strictMotif(self, boolean=None): ...
    def tk_bisque(self) -> None: ...
    def tk_setPalette(self, *args, **kw) -> None: ...
    def wait_variable(self, name: str | Variable = "PY_VAR") -> None: ...
@@ -442,15 +442,15 @@ class Misc:
    ) -> None: ...
    def option_clear(self) -> None: ...
    def option_get(self, name, className): ...
-    def option_readfile(self, fileName, priority: Incomplete | None = None) -> None: ...
+    def option_readfile(self, fileName, priority=None) -> None: ...
    def selection_clear(self, **kw) -> None: ...
    def selection_get(self, **kw): ...
    def selection_handle(self, command, **kw) -> None: ...
    def selection_own(self, **kw) -> None: ...
    def selection_own_get(self, **kw): ...
    def send(self, interp, cmd, *args): ...
-    def lower(self, belowThis: Incomplete | None = None) -> None: ...
-    def tkraise(self, aboveThis: Incomplete | None = None) -> None: ...
+    def lower(self, belowThis=None) -> None: ...
+    def tkraise(self, aboveThis=None) -> None: ...
    lift = tkraise
    if sys.version_info >= (3, 11):
        def info_patchlevel(self) -> _VersionInfoType: ...
@@ -888,29 +888,23 @@ class Wm:
    @overload
    def wm_geometry(self, newGeometry: str) -> None: ...
    geometry = wm_geometry
-    def wm_grid(
-        self,
-        baseWidth: Incomplete | None = None,
-        baseHeight: Incomplete | None = None,
-        widthInc: Incomplete | None = None,
-        heightInc: Incomplete | None = None,
-    ): ...
+    def wm_grid(self, baseWidth=None, baseHeight=None, widthInc=None, heightInc=None): ...
    grid = wm_grid
-    def wm_group(self, pathName: Incomplete | None = None): ...
+    def wm_group(self, pathName=None): ...
    group = wm_group
-    def wm_iconbitmap(self, bitmap: Incomplete | None = None, default: Incomplete | None = None): ...
+    def wm_iconbitmap(self, bitmap=None, default=None): ...
    iconbitmap = wm_iconbitmap
    def wm_iconify(self) -> None: ...
    iconify = wm_iconify
-    def wm_iconmask(self, bitmap: Incomplete | None = None): ...
+    def wm_iconmask(self, bitmap=None): ...
    iconmask = wm_iconmask
-    def wm_iconname(self, newName: Incomplete | None = None) -> str: ...
+    def wm_iconname(self, newName=None) -> str: ...
    iconname = wm_iconname
    def wm_iconphoto(self, default: bool, image1: _PhotoImageLike | str, /, *args: _PhotoImageLike | str) -> None: ...
    iconphoto = wm_iconphoto
    def wm_iconposition(self, x: int | None = None, y: int | None = None) -> tuple[int, int] | None: ...
    iconposition = wm_iconposition
-    def wm_iconwindow(self, pathName: Incomplete | None = None): ...
+    def wm_iconwindow(self, pathName=None): ...
    iconwindow = wm_iconwindow
    def wm_manage(self, widget) -> None: ...
    manage = wm_manage
@@ -1453,8 +1447,8 @@ class Canvas(Widget, XView, YView):
    @overload
    def tag_bind(self, tagOrId: str | int, *, func: str, add: Literal["", "+"] | bool | None = None) -> None: ...
    def tag_unbind(self, tagOrId: str | int, sequence: str, funcid: str | None = None) -> None: ...
-    def canvasx(self, screenx, gridspacing: Incomplete | None = None): ...
-    def canvasy(self, screeny, gridspacing: Incomplete | None = None): ...
+    def canvasx(self, screenx, gridspacing=None): ...
+    def canvasy(self, screeny, gridspacing=None): ...
    @overload
    def coords(self, tagOrId: str | int, /) -> list[float]: ...
    @overload
@@ -2462,7 +2456,7 @@ class Listbox(Widget, XView, YView):
    select_set = selection_set
    def size(self) -> int: ...  # type: ignore[override]
    def itemcget(self, index: str | int, option): ...
-    def itemconfigure(self, index: str | int, cnf: Incomplete | None = None, **kw): ...
+    def itemconfigure(self, index: str | int, cnf=None, **kw): ...
    itemconfig = itemconfigure

 class Menu(Widget):
@@ -3142,7 +3136,7 @@ class Scrollbar(Widget):
    @overload
    def configure(self, cnf: str) -> tuple[str, str, str, Any, Any]: ...
    config = configure
-    def activate(self, index: Incomplete | None = None): ...
+    def activate(self, index=None): ...
    def delta(self, deltax: int, deltay: int) -> float: ...
    def fraction(self, x: int, y: int) -> float: ...
    def identify(self, x: int, y: int) -> Literal["arrow1", "arrow2", "slider", "trough1", "trough2", ""]: ...
@@ -3625,7 +3619,7 @@ class Text(Widget, XView, YView):
    def yview_pickplace(self, *what): ...  # deprecated

 class _setit:
-    def __init__(self, var, value, callback: Incomplete | None = None) -> None: ...
+    def __init__(self, var, value, callback=None) -> None: ...
    def __call__(self, *args) -> None: ...

 # manual page: tk_optionMenu
@@ -3663,9 +3657,7 @@ class _PhotoImageLike(_Image): ...
 class Image(_Image):
    name: Incomplete
    tk: _tkinter.TkappType
-    def __init__(
-        self, imgtype, name: Incomplete | None = None, cnf={}, master: Misc | _tkinter.TkappType | None = None, **kw
-    ) -> None: ...
+    def __init__(self, imgtype, name=None, cnf={}, master: Misc | _tkinter.TkappType | None = None, **kw) -> None: ...
    def __del__(self) -> None: ...
    def __setitem__(self, key, value) -> None: ...
    def __getitem__(self, key): ...
@@ -3791,7 +3783,7 @@ class BitmapImage(Image, _BitmapImageLike):
    # This should be kept in sync with PIL.ImageTK.BitmapImage.__init__()
    def __init__(
        self,
-        name: Incomplete | None = None,
+        name=None,
        cnf: dict[str, Any] = {},
        master: Misc | _tkinter.TkappType | None = None,
        *,
@@ -3925,7 +3917,7 @@ class Spinbox(Widget, XView):
    def configure(self, cnf: str) -> tuple[str, str, str, Any, Any]: ...
    config = configure
    def bbox(self, index) -> tuple[int, int, int, int] | None: ...  # type: ignore[override]
-    def delete(self, first, last: Incomplete | None = None) -> Literal[""]: ...
+    def delete(self, first, last=None) -> Literal[""]: ...
    def get(self) -> str: ...
    def icursor(self, index): ...
    def identify(self, x: int, y: int) -> Literal["", "buttondown", "buttonup", "entry"]: ...
@@ -3939,7 +3931,7 @@ class Spinbox(Widget, XView):
    def selection(self, *args) -> tuple[int, ...]: ...
    def selection_adjust(self, index): ...
    def selection_clear(self): ...  # type: ignore[override]
-    def selection_element(self, element: Incomplete | None = None): ...
+    def selection_element(self, element=None): ...
    def selection_from(self, index: int) -> None: ...
    def selection_present(self) -> None: ...
    def selection_range(self, start: int, end: int) -> None: ...
@@ -4082,7 +4074,7 @@ class PanedWindow(Widget):
    def sash_mark(self, index): ...
    def sash_place(self, index, x, y): ...
    def panecget(self, child, option): ...
-    def paneconfigure(self, tagOrId, cnf: Incomplete | None = None, **kw): ...
+    def paneconfigure(self, tagOrId, cnf=None, **kw): ...
    paneconfig: Incomplete
    def panes(self): ...

@@ -8,5 +8,5 @@ class Dialog:
    command: ClassVar[str | None]
    master: Incomplete | None
    options: Mapping[str, Incomplete]
-    def __init__(self, master: Incomplete | None = None, **options) -> None: ...
+    def __init__(self, master=None, **options) -> None: ...
    def show(self, **options): ...
@@ -1,4 +1,3 @@
-from _typeshed import Incomplete
 from collections.abc import Mapping
 from tkinter import Widget
 from typing import Any, Final
@@ -10,5 +9,5 @@ DIALOG_ICON: Final = "questhead"
 class Dialog(Widget):
    widgetName: str
    num: int
-    def __init__(self, master: Incomplete | None = None, cnf: Mapping[str, Any] = {}, **kw) -> None: ...
+    def __init__(self, master=None, cnf: Mapping[str, Any] = {}, **kw) -> None: ...
    def destroy(self) -> None: ...
@@ -38,21 +38,21 @@ class FileDialog:
    filter_button: Button
    cancel_button: Button
    def __init__(
-        self, master, title: Incomplete | None = None
+        self, master, title=None
    ) -> None: ...  # title is usually a str or None, but e.g. int doesn't raise en exception either
    how: Incomplete | None
-    def go(self, dir_or_file=".", pattern: str = "*", default: str = "", key: Incomplete | None = None): ...
-    def quit(self, how: Incomplete | None = None) -> None: ...
+    def go(self, dir_or_file=".", pattern: str = "*", default: str = "", key=None): ...
+    def quit(self, how=None) -> None: ...
    def dirs_double_event(self, event) -> None: ...
    def dirs_select_event(self, event) -> None: ...
    def files_double_event(self, event) -> None: ...
    def files_select_event(self, event) -> None: ...
    def ok_event(self, event) -> None: ...
    def ok_command(self) -> None: ...
-    def filter_command(self, event: Incomplete | None = None) -> None: ...
+    def filter_command(self, event=None) -> None: ...
    def get_filter(self): ...
    def get_selection(self): ...
-    def cancel_command(self, event: Incomplete | None = None) -> None: ...
+    def cancel_command(self, event=None) -> None: ...
    def set_filter(self, dir, pat) -> None: ...
    def set_selection(self, file) -> None: ...

@@ -35,7 +35,7 @@ __all__ = [
 ]

 def tclobjs_to_py(adict: dict[Any, Any]) -> dict[Any, Any]: ...
-def setup_master(master: Incomplete | None = None): ...
+def setup_master(master=None): ...

 _Padding: TypeAlias = (
    tkinter._ScreenUnits
@@ -52,14 +52,14 @@ class Style:
    master: Incomplete
    tk: _tkinter.TkappType
    def __init__(self, master: tkinter.Misc | None = None) -> None: ...
-    def configure(self, style, query_opt: Incomplete | None = None, **kw): ...
-    def map(self, style, query_opt: Incomplete | None = None, **kw): ...
-    def lookup(self, style, option, state: Incomplete | None = None, default: Incomplete | None = None): ...
-    def layout(self, style, layoutspec: Incomplete | None = None): ...
+    def configure(self, style, query_opt=None, **kw): ...
+    def map(self, style, query_opt=None, **kw): ...
+    def lookup(self, style, option, state=None, default=None): ...
+    def layout(self, style, layoutspec=None): ...
    def element_create(self, elementname, etype, *args, **kw) -> None: ...
    def element_names(self): ...
    def element_options(self, elementname): ...
-    def theme_create(self, themename, parent: Incomplete | None = None, settings: Incomplete | None = None) -> None: ...
+    def theme_create(self, themename, parent=None, settings=None) -> None: ...
    def theme_settings(self, themename, settings) -> None: ...
    def theme_names(self) -> tuple[str, ...]: ...
    @overload
@@ -68,10 +68,10 @@ class Style:
    def theme_use(self, themename: None = None) -> str: ...

 class Widget(tkinter.Widget):
-    def __init__(self, master: tkinter.Misc | None, widgetname, kw: Incomplete | None = None) -> None: ...
+    def __init__(self, master: tkinter.Misc | None, widgetname, kw=None) -> None: ...
    def identify(self, x: int, y: int) -> str: ...
-    def instate(self, statespec, callback: Incomplete | None = None, *args, **kw): ...
-    def state(self, statespec: Incomplete | None = None): ...
+    def instate(self, statespec, callback=None, *args, **kw): ...
+    def state(self, statespec=None): ...

 class Button(Widget):
    def __init__(
@@ -567,8 +567,8 @@ class Notebook(Widget):
    def identify(self, x: int, y: int) -> str: ...
    def index(self, tab_id): ...
    def insert(self, pos, child, **kw) -> None: ...
-    def select(self, tab_id: Incomplete | None = None): ...
-    def tab(self, tab_id, option: Incomplete | None = None, **kw): ...
+    def select(self, tab_id=None): ...
+    def tab(self, tab_id, option=None, **kw): ...
    def tabs(self): ...
    def enable_traversal(self) -> None: ...

@@ -617,8 +617,8 @@ class Panedwindow(Widget, tkinter.PanedWindow):
    def config(self, cnf: str) -> tuple[str, str, str, Any, Any]: ...
    forget: Incomplete
    def insert(self, pos, child, **kw) -> None: ...
-    def pane(self, pane, option: Incomplete | None = None, **kw): ...
-    def sashpos(self, index, newpos: Incomplete | None = None): ...
+    def pane(self, pane, option=None, **kw): ...
+    def sashpos(self, index, newpos=None): ...

 PanedWindow = Panedwindow