winipedia-utils 0.1.9__tar.gz → 0.1.11__tar.gz

{winipedia_utils-0.1.9 → winipedia_utils-0.1.11}/PKG-INFO

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

{winipedia_utils-0.1.9 → winipedia_utils-0.1.11}/pyproject.toml

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

{winipedia_utils-0.1.9 → winipedia_utils-0.1.11}/winipedia_utils/modules/function.py

@@ -84,3 +84,20 @@ def get_all_functions_from_module(module: ModuleType | str) -> list[Callable[...
     ]
     # sort by definition order
     return sorted(funcs, key=get_def_line)
+
+
+def unwrap_method(method: Any) -> Callable[..., Any] | Any:
+    """Unwrap a method to its underlying function.
+
+    Args:
+        method: The method to unwrap
+
+    Returns:
+        The underlying function of the method
+
+    """
+    if isinstance(method, (staticmethod, classmethod)):
+        method = method.__func__
+    if isinstance(method, property):
+        method = method.fget
+    return inspect.unwrap(method)

{winipedia_utils-0.1.9 → winipedia_utils-0.1.11}/winipedia_utils/modules/package.py

@@ -143,6 +143,10 @@ def get_modules_and_packages_from_package(
         else:
             modules.append(mod)
 
+    # make consistent order
+    packages.sort(key=lambda p: p.__name__)
+    modules.sort(key=lambda m: m.__name__)
+
     return packages, modules
 
 

{winipedia_utils-0.1.9 → winipedia_utils-0.1.11}/winipedia_utils/oop/mixins/meta.py

@@ -15,7 +15,7 @@ from typing import Any, final
 
 from winipedia_utils.logging.logger import get_logger
 from winipedia_utils.modules.class_ import get_all_methods_from_cls
-from winipedia_utils.modules.function import is_func
+from winipedia_utils.modules.function import is_func, unwrap_method
 from winipedia_utils.text.string import value_to_truncated_string
 
 logger = get_logger(__name__)
@@ -249,6 +249,7 @@ class ImplementationMeta(type):
             True if the method is marked with @final, False otherwise
 
         """
+        method = unwrap_method(method)
         return getattr(method, "__final__", False)
 
     @staticmethod
@@ -262,6 +263,7 @@ class ImplementationMeta(type):
             True if the method is marked with @abstractmethod, False otherwise
 
         """
+        method = unwrap_method(method)
         return getattr(method, "__isabstractmethod__", False)
 
     def check_attrs_implemented(cls) -> None: