omlish 0.0.0.dev68__tar.gz → 0.0.0.dev70__tar.gz

{omlish-0.0.0.dev68/omlish.egg-info → omlish-0.0.0.dev70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev68
+Version: 0.0.0.dev70
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev68 → omlish-0.0.0.dev70}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev68'
-__revision__ = '60a77b10e4421b5bcc3597af79e50d5c8ab4d924'
+__version__ = '0.0.0.dev70'
+__revision__ = '8d6f6c3ead70cde56b9d8040a05d9f91f6dd90ff'
 
 
 #

{omlish-0.0.0.dev68 → omlish-0.0.0.dev70}/omlish/lang/imports.py

@@ -12,7 +12,12 @@ from .cached import cached_function
 
 
 def can_import(name: str, package: str | None = None) -> bool:
-    return importlib.util.find_spec(name, package) is not None
+    try:
+        spec = importlib.util.find_spec(name, package)
+    except ImportError:
+        return False
+    else:
+        return spec is not None
 
 
 ##
@@ -22,13 +27,23 @@ def lazy_import(name: str, package: str | None = None) -> ta.Callable[[], ta.Any
     return cached_function(functools.partial(importlib.import_module, name, package=package))
 
 
-def proxy_import(name: str, package: str | None = None) -> types.ModuleType:
+def proxy_import(
+        name: str,
+        package: str | None = None,
+        extras: ta.Iterable[str] | None = None,
+) -> types.ModuleType:
+    if isinstance(extras, str):
+        raise TypeError(extras)
+
     omod = None
 
     def __getattr__(att):  # noqa
         nonlocal omod
         if omod is None:
             omod = importlib.import_module(name, package=package)
+            if extras:
+                for x in extras:
+                    importlib.import_module(f'{name}.{x}', package=package)
         return getattr(omod, att)
 
     lmod = types.ModuleType(name)

{omlish-0.0.0.dev68 → omlish-0.0.0.dev70}/omlish/lang/objects.py

@@ -87,7 +87,7 @@ def super_meta(
 ##
 
 
-def deep_subclasses(cls: type, *, concrete_only: bool = False) -> ta.Iterator[type]:
+def deep_subclasses(cls: type[T], *, concrete_only: bool = False) -> ta.Iterator[type[T]]:
     seen = set()
     todo = list(reversed(cls.__subclasses__()))
     while todo:

{omlish-0.0.0.dev68 → omlish-0.0.0.dev70}/omlish/libc.py

@@ -1,4 +1,4 @@
-# ruff: noqa: ANN201, N801, N802
+# ruff: noqa: ANN201 N801 N802
 import ctypes as ct
 import errno
 import platform

{omlish-0.0.0.dev68 → omlish-0.0.0.dev70}/omlish/testing/__init__.py

@@ -1,7 +1,6 @@
 from .testing import (  # noqa
     assert_dicts_equal_ordered,
     call_many_with_timeout,
-    can_import,
     run_with_timeout,
     waitpid_with_timeout,
     xfail,

{omlish-0.0.0.dev68 → omlish-0.0.0.dev70}/omlish/testing/pytest/plugins/managermarks.py

@@ -37,7 +37,7 @@ class ManagerMarksPlugin:
     def mark_classes(self) -> ta.Mapping[str, type[ManagerMark]]:
         return {
             cls.__name__: cls
-            for cls in _deep_subclasses(ManagerMark)
+            for cls in lang.deep_subclasses(ManagerMark)  # type: ignore[type-abstract]
             if not lang.is_abstract_class(cls)
         }
 

{omlish-0.0.0.dev68 → omlish-0.0.0.dev70}/omlish/testing/pytest/skip.py

@@ -5,11 +5,11 @@ import typing as ta
 
 import pytest
 
-from ..testing import can_import
+from ... import lang
 
 
 def if_cant_import(module: str, *args, **kwargs):
-    return pytest.mark.skipif(not can_import(module, *args, **kwargs), reason=f'requires import {module}')
+    return pytest.mark.skipif(not lang.can_import(module, *args, **kwargs), reason=f'requires import {module}')
 
 
 def if_not_on_path(exe: str):

{omlish-0.0.0.dev68 → omlish-0.0.0.dev70}/omlish/testing/testing.py

@@ -1,5 +1,4 @@
 import functools
-import importlib
 import os
 import sys
 import threading
@@ -89,15 +88,6 @@ def waitpid_with_timeout(
             raise timeout_exception
 
 
-def can_import(*args, **kwargs) -> bool:
-    try:
-        importlib.import_module(*args, **kwargs)
-    except ImportError:
-        return False
-    else:
-        return True
-
-
 def xfail(fn):
     @functools.wraps(fn)
     def inner(*args, **kwargs):

{omlish-0.0.0.dev68 → omlish-0.0.0.dev70/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev68
+Version: 0.0.0.dev70
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev68 → omlish-0.0.0.dev70}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev68'
+version = '0.0.0.dev70'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',