winipedia-utils 0.1.27__tar.gz → 0.1.29__tar.gz

{winipedia_utils-0.1.27 → winipedia_utils-0.1.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: winipedia-utils
-Version: 0.1.27
+Version: 0.1.29
 Summary: A package with many utility functions
 License: MIT
 Author: Winipedia

{winipedia_utils-0.1.27 → winipedia_utils-0.1.29}/pyproject.toml

@@ -1,7 +1,7 @@
 # Project section
 [project]
 name = "winipedia-utils"
-version = "0.1.27"
+version = "0.1.29"
 description = "A package with many utility functions"
 readme = "README.md"
 requires-python = ">=3.12,<3.14"

{winipedia_utils-0.1.27 → winipedia_utils-0.1.29}/winipedia_utils/modules/class_.py

@@ -74,3 +74,43 @@ def get_all_cls_from_module(module: ModuleType | str) -> list[type]:
     ]
     # sort by definition order
     return sorted(classes, key=get_def_line)
+
+
+def get_all_subclasses(cls: type) -> list[type]:
+    """Get all subclasses of a class.
+
+    Retrieves all classes that are subclasses of the specified class.
+    Also returns subclasses of subclasses (recursive).
+
+    Args:
+        cls: The class to find subclasses of
+
+    Returns:
+        A list of subclasses of the given class
+
+    """
+    subclasses_set = set(cls.__subclasses__())
+    for subclass in cls.__subclasses__():
+        subclasses_set.update(get_all_subclasses(subclass))
+    return list(subclasses_set)
+
+
+def get_all_nonabstract_subclasses(cls: type) -> list[type]:
+    """Get all non-abstract subclasses of a class.
+
+    Retrieves all classes that are subclasses of the specified class,
+    excluding abstract classes. Also returns subclasses of subclasses
+    (recursive).
+
+    Args:
+        cls: The class to find subclasses of
+
+    Returns:
+        A list of non-abstract subclasses of the given class
+
+    """
+    return [
+        subclass
+        for subclass in get_all_subclasses(cls)
+        if not inspect.isabstract(subclass)
+    ]

{winipedia_utils-0.1.27 → winipedia_utils-0.1.29}/winipedia_utils/pyside/ui/base/base.py

@@ -11,6 +11,9 @@ from PySide6.QtCore import QObject
 from PySide6.QtGui import QIcon
 from PySide6.QtWidgets import QStackedWidget
 
+from winipedia_utils.modules.class_ import (
+    get_all_nonabstract_subclasses,
+)
 from winipedia_utils.modules.package import get_main_package, walk_package
 from winipedia_utils.oop.mixins.meta import ABCImplementationLoggingMeta
 from winipedia_utils.resources.svgs.svg import get_svg_path
@@ -76,9 +79,8 @@ class Base(metaclass=QABCImplementationLoggingMeta):
 
         _ = list(walk_package(package))
 
-        children = cls.__subclasses__()
-        sorted_children = sorted(children, key=lambda cls: cls.__name__)
-        return [child for child in sorted_children if not child.is_abstract_cls()]
+        children = get_all_nonabstract_subclasses(cls)
+        return sorted(children, key=lambda cls: cls.__name__)
 
     @final
     def set_current_page(self, page_cls: type["BasePage"]) -> None:

{winipedia_utils-0.1.27 → winipedia_utils-0.1.29}/winipedia_utils/resources/svgs/svg.py

@@ -1,13 +1,15 @@
 """utils for svgs."""
 
+from importlib.resources import as_file, files
 from pathlib import Path
 from types import ModuleType
 
-from winipedia_utils.modules.module import to_path
 from winipedia_utils.resources import svgs
 
 
 def get_svg_path(svg_name: str, package: ModuleType | None = None) -> Path:
     """Get the path to a svg."""
     package = package or svgs
-    return (to_path(package, is_package=True) / svg_name).with_suffix(".svg")
+    svg_path = files(package) / f"{svg_name}.svg"
+    with as_file(svg_path) as path:
+        return path