Merge branch 'master' of https://github.com/Kalmat/EWMHlib

Author: Avasam

CHANGES.txt

@@ -1,3 +1,4 @@
 0.3, 2026/XX/XX -- Replaced bare `except:` clauses with `except Exception:`, preventing accidental suppression of system-exit signals (KeyboardInterrupt, SystemExit) during error handling.
+                   Removed dependency on `typing_extensions`
 0.2, 2024/04/17 -- Improved getPropertyValue()
 0.1, 2023/05/22 -- Initial version

README.md

@@ -43,12 +43,17 @@
 # -- Copy the modules documentation ------------------------------------------
 # https://stackoverflow.com/questions/66495200/is-it-possible-to-include-external-rst-files-in-my-documentation
 from urllib.request import urlretrieve
+import os
 
 urlretrieve(
     "https://raw.githubusercontent.com/kalmat/ewmhlib/master/README.md",
     "index.md"
 )
+
+os.mkdir("docs")
+os.chdir("docs")
 urlretrieve(
-    "https://raw.githubusercontent.com/kalmat/ewmhlib/master/docstrings.md",
+    "https://raw.githubusercontent.com/kalmat/ewmhlib/master/docs/docstrings.md",
     "docstrings.md"
 )
+os.chdir("..")

docstrings.md docs/docstrings.mddocstrings.md renamed to docs/docstrings.md

@@ -45,7 +45,6 @@ classifiers = [
 ]
 dependencies = [
     "python-xlib>=0.21; sys_platform == 'linux'",
-    "typing_extensions>=4.4.0",
 ]
 
 [dependency-groups]

docs/source/conf.py

@@ -1,4 +1,4 @@
 #!/usr/bin/python
 
-from ._props import (Root, DesktopLayout, Window, WindowType, State, StateAction,
-                     MoveResize, DataFormat, Mode, StackMode, HintAction)
+from ._props import (Root as Root, DesktopLayout as DesktopLayout, Window as Window, WindowType as WindowType, State as State, StateAction as StateAction,
+                     MoveResize as MoveResize, DataFormat as DataFormat, Mode as Mode, StackMode as StackMode, HintAction as HintAction)

pyproject.toml

@@ -1,3 +1,3 @@
 #!/usr/bin/python
 
-from ._structs import (ScreensInfo, DisplaysInfo, WmHints, Aspect, WmNormalHints)
+from ._structs import (ScreensInfo as ScreensInfo, DisplaysInfo as DisplaysInfo, WmHints as WmHints, Aspect as Aspect, WmNormalHints as WmNormalHints)

src/ewmhlib/Props/__init__.py

@@ -1,8 +1,7 @@
 #!/usr/bin/python
 
 from __future__ import annotations
-from typing_extensions import TypedDict
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, TypedDict
 
 from ctypes import Structure, c_int32, c_ulong, c_uint32
 

src/ewmhlib/Structs/__init__.py

@@ -1,6 +1,15 @@
 #!/usr/bin/python
 from importlib.metadata import version as _importlib_version
 
+from ._main import (displaysCount, getDisplays, getDisplaysInfo, getRoots,
+                    defaultDisplay, defaultScreen, defaultRoot, defaultEwmhRoot,
+                    getDisplayFromRoot, getScreenFromRoot,
+                    getDisplayFromWindow, getScreenFromWindow, getRootFromWindow,
+                    getProperty, getPropertyValue, changeProperty, sendMessage,
+                    EwmhRoot, EwmhWindow,
+                    Props, Structs
+                    )
+
 __all__ = [
     "version", "displaysCount", "getDisplays", "getDisplaysInfo", "getRoots",
     "defaultDisplay", "defaultScreen", "defaultRoot", "defaultEwmhRoot",
@@ -14,16 +23,7 @@
 __version__ = _importlib_version("ewmhlib")
 
 
-def version(numberOnly: bool = True):
+def version(numberOnly: bool = True) -> str:
     """Returns the current version of ewmhlib module, in the form ''x.x.xx'' as string"""
     return ("" if numberOnly else "EWMHlib-")+__version__
 
-
-from ._main import (displaysCount, getDisplays, getDisplaysInfo, getRoots,
-                    defaultDisplay, defaultScreen, defaultRoot, defaultEwmhRoot,
-                    getDisplayFromRoot, getScreenFromRoot,
-                    getDisplayFromWindow, getScreenFromWindow, getRootFromWindow,
-                    getProperty, getPropertyValue, changeProperty, sendMessage,
-                    EwmhRoot, EwmhWindow,
-                    Props, Structs
-                    )

src/ewmhlib/Structs/_structs.py

@@ -2,7 +2,9 @@
 from __future__ import annotations
 
 import sys
-assert sys.platform == "linux"
+
+if sys.platform != "linux":
+    raise OSError(f"Cannot import {__name__} on {sys.platform}")
 
 import array
 import os
@@ -14,14 +16,26 @@
 import Xlib.protocol
 import Xlib.X
 import Xlib.Xatom
-import Xlib.Xutil
-import Xlib.ext
 import Xlib.xobject
+import Xlib.Xutil
 from Xlib.xobject.drawable import Window as XWindow
 
-from .Props import (Root, DesktopLayout, Window, WindowType, State, StateAction,
-                           MoveResize, DataFormat, Mode, HintAction)
-from .Structs import DisplaysInfo, ScreensInfo, WmHints, Aspect, WmNormalHints
+from .Props import (
+    DataFormat,
+    DesktopLayout,
+    HintAction,
+    Mode,
+    MoveResize,
+    Root,
+    State,
+    StateAction,
+    Window,
+    WindowType,
+)
+from .Structs import Aspect, DisplaysInfo, ScreensInfo, WmHints, WmNormalHints
+
+if TYPE_CHECKING:
+    from Xlib.protocol.rq import Struct
 
 if TYPE_CHECKING:
     from Xlib.protocol.rq import Struct
@@ -2713,7 +2727,7 @@ def findit(hwnd: XWindow) -> None:
 #     input_pm: Xlib.xobject.drawable.Pixmap = xWin.create_pixmap(width, height, 1)
 #     gc: Xlib.xobject.fontable.GC = input_pm.create_gc(foreground=0, background=0)
 #     input_pm.fill_rectangle(gc.id, 0, 0, width, height)
-#     xWin.shape_mask(Xlib.ext.shape.SO.Set, Xlib.ext.shape.SK.Input, 0, 0, input_pm)  # type: ignore[attr-defined]  # pyright: ignore[reportGeneralTypeIssues, reportUnknownMemberType]
+#     xWin.shape_mask(Xlib.ext.shape.SO.Set, Xlib.ext.shape.SK.Input, 0, 0, input_pm)
 #     # xWin.shape_select_input(0)
 #
 #     xWin.map()