From 58664d7f88bf7a0cc89e723633bb89491d56c256 Mon Sep 17 00:00:00 2001 From: hwdev Date: Fri, 20 Nov 2026 19:07:37 +0000 Subject: [PATCH] [pyxdg] Menu and icon lookups can return None Menu.getMenu(), Menu.getMenuEntry(), getIconPath() and getIconData() return None when nothing matches. getMenuEntry() compares its argument with MenuEntry.DesktopFileID, so the parameter is str, not int. --- stubs/pyxdg/xdg/IconTheme.pyi | 4 ++-- stubs/pyxdg/xdg/Menu.pyi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stubs/pyxdg/xdg/IconTheme.pyi b/stubs/pyxdg/xdg/IconTheme.pyi index 40ba87afda55..70c348aa39f7 100644 --- a/stubs/pyxdg/xdg/IconTheme.pyi +++ b/stubs/pyxdg/xdg/IconTheme.pyi @@ -48,8 +48,8 @@ icon_cache: dict[tuple[str, int, str, tuple[str, ...]], tuple[float, str]] def getIconPath( iconname: str, size: int | None = None, theme: str | None = None, extensions: Collection[str] = ["png", "svg", "xpm"] -) -> str: ... -def getIconData(path: str) -> IconData: ... +) -> str | None: ... +def getIconData(path: str) -> IconData | None: ... def LookupIcon(iconname: str, size: int, theme: str, extensions: Collection[str]) -> str: ... def DirectoryMatchesSize(subdir: str, iconsize: int, theme: str) -> bool: ... def DirectorySizeDistance(subdir: str, iconsize: int, theme: str) -> int: ... diff --git a/stubs/pyxdg/xdg/Menu.pyi b/stubs/pyxdg/xdg/Menu.pyi index 0d56c6c28369..c42373e4668f 100644 --- a/stubs/pyxdg/xdg/Menu.pyi +++ b/stubs/pyxdg/xdg/Menu.pyi @@ -42,8 +42,8 @@ class Menu: def __lt__(self, other: object) -> bool: ... def __eq__(self, other: object) -> bool: ... def getEntries(self, show_hidden: bool = False) -> Iterator[str]: ... - def getMenuEntry(self, desktopfileid: int, deep: bool = False) -> MenuEntry: ... - def getMenu(self, path: str) -> Menu: ... + def getMenuEntry(self, desktopfileid: str, deep: bool = False) -> MenuEntry | None: ... + def getMenu(self, path: str) -> Menu | None: ... def getPath(self, org: bool = False, toplevel: bool = False) -> str: ... def getName(self) -> str: ... def getGenericName(self) -> str: ...