python-utils 4.2.0__tar.gz → 4.2.1__tar.gz

{python_utils-4.2.0 → python_utils-4.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-utils
-Version: 4.2.0
+Version: 4.2.1
 Summary: Python Utils is a module with some convenient utilities not included with the standard Python install
 Keywords: utils,utilities,helpers,typing,typed,async,lazy-imports
 Author: Rick van Hattem
@@ -37,6 +37,7 @@ Project-URL: Documentation, https://python-utils.readthedocs.io/
 Project-URL: Repository, https://github.com/WoLpH/python-utils
 Project-URL: Changelog, https://github.com/WoLpH/python-utils/releases
 Project-URL: Funding, https://github.com/sponsors/wolph
+Project-URL: Issues, https://github.com/wolph/python-utils/issues
 Provides-Extra: docs
 Provides-Extra: loguru
 Provides-Extra: tests

{python_utils-4.2.0 → python_utils-4.2.1}/_python_utils_tests/test_import.py

@@ -299,3 +299,106 @@ def test_import_global_requested_name_needs_an_export(
     import_.import_global(module_name, ['eggs'], locals_={}, globals_=scope)
     assert scope == {}
     assert 'eggs' not in calls
+
+
+@pytest.fixture
+def deep_package(
+    tmp_path: pathlib.Path, monkeypatch: pytest.MonkeyPatch
+) -> collections.abc.Iterator[str]:
+    """Create ``testrel.nested.deeper`` with importable helper modules."""
+    package: pathlib.Path = tmp_path / 'testrel'
+    nested: pathlib.Path = package / 'nested'
+    deeper: pathlib.Path = nested / 'deeper'
+    deeper.mkdir(parents=True)
+    (package / '__init__.py').write_text('', encoding='utf-8')
+    (nested / '__init__.py').write_text('', encoding='utf-8')
+    (deeper / '__init__.py').write_text('', encoding='utf-8')
+    (package / 'helper.py').write_text('value = 42\n', encoding='utf-8')
+    (nested / 'inner.py').write_text(
+        "inner_value = 'inner'\n", encoding='utf-8'
+    )
+    monkeypatch.setattr(sys, 'path', [str(tmp_path), *sys.path])
+
+    yield 'testrel'
+
+    imported: list[str] = [
+        name for name in sys.modules if name.split('.')[0] == 'testrel'
+    ]
+    for name in imported:
+        del sys.modules[name]
+
+
+def test_import_globals_relative_import_two_dots(deep_package: str) -> None:
+    """Resolve ``..helper`` two levels up, to ``testrel.helper`` (#73)."""
+    locals_: types.Dict[str, types.Any] = {}
+    globals_: types.Dict[str, types.Any] = {'__package__': 'testrel.nested'}
+    import_.import_global('..helper', locals_=locals_, globals_=globals_)
+    assert globals_['value'] == 42
+
+
+def test_import_globals_relative_import_three_dots(deep_package: str) -> None:
+    """Resolve ``...helper`` three levels up, to ``testrel.helper`` (#73)."""
+    locals_: types.Dict[str, types.Any] = {}
+    globals_: types.Dict[str, types.Any] = {
+        '__package__': 'testrel.nested.deeper'
+    }
+    import_.import_global('...helper', locals_=locals_, globals_=globals_)
+    assert globals_['value'] == 42
+
+
+def test_import_globals_relative_import_one_dot(deep_package: str) -> None:
+    """Keep resolving a single leading dot one level up (#73 control)."""
+    locals_: types.Dict[str, types.Any] = {}
+    globals_: types.Dict[str, types.Any] = {'__package__': 'testrel.nested'}
+    import_.import_global('.inner', locals_=locals_, globals_=globals_)
+    assert globals_['inner_value'] == 'inner'
+
+
+def test_import_globals_relative_import_dots_only(deep_package: str) -> None:
+    """Reject a dots-only name, which names no module to import (#73)."""
+    locals_: types.Dict[str, types.Any] = {}
+    globals_: types.Dict[str, types.Any] = {'__package__': 'testrel.nested'}
+    with pytest.raises(ImportError):
+        import_.import_global('..', locals_=locals_, globals_=globals_)
+
+
+def test_import_globals_relative_import_dots_only_exception(
+    deep_package: str,
+) -> None:
+    """Keep raising ModuleNotFoundError for a dots-only name, as 4.2.0 did."""
+    globals_: types.Dict[str, types.Any] = {
+        '__package__': 'testrel.nested.deeper'
+    }
+    error = import_.import_global(
+        '...',
+        exceptions=ModuleNotFoundError,
+        locals_={},
+        globals_=globals_,
+    )
+    assert isinstance(error, ModuleNotFoundError)
+
+
+def test_import_globals_relative_import_beyond_top_level(
+    deep_package: str,
+) -> None:
+    """Raise ModuleNotFoundError above the top-level package, as 4.2.0 did."""
+    globals_: types.Dict[str, types.Any] = {
+        '__package__': 'testrel.nested.deeper'
+    }
+    with pytest.raises(ModuleNotFoundError, match='beyond top-level'):
+        import_.import_global('....helper', locals_={}, globals_=globals_)
+
+
+def test_import_globals_empty_name() -> None:
+    """Keep raising IndexError for an empty name, as 4.2.0 did."""
+    with pytest.raises(IndexError):
+        import_.import_global('', locals_={}, globals_={'__package__': ''})
+
+
+def test_import_globals_relative_import_trailing_dot(
+    deep_package: str,
+) -> None:
+    """Raise ModuleNotFoundError for ``..helper.``, as 4.2.0 did."""
+    globals_: types.Dict[str, types.Any] = {'__package__': 'testrel.nested'}
+    with pytest.raises(ModuleNotFoundError):
+        import_.import_global('..helper.', locals_={}, globals_=globals_)

{python_utils-4.2.0 → python_utils-4.2.1}/pyproject.toml

@@ -70,6 +70,7 @@ doctest_optionflags = [
     "ALLOW_BYTES",
 ]
 asyncio_mode = "strict"
+asyncio_default_fixture_loop_scope = "function"
 xfail_strict = true
 filterwarnings = [
     "error",
@@ -125,7 +126,7 @@ source-include = [
 
 [project]
 name = "python-utils"
-version = "4.2.0"
+version = "4.2.1"
 description = "Python Utils is a module with some convenient utilities not included with the standard Python install"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -168,6 +169,7 @@ Documentation = "https://python-utils.readthedocs.io/"
 Repository = "https://github.com/WoLpH/python-utils"
 Changelog = "https://github.com/WoLpH/python-utils/releases"
 Funding = "https://github.com/sponsors/wolph"
+Issues = "https://github.com/wolph/python-utils/issues"
 
 [project.optional-dependencies]
 loguru = ["loguru"]

{python_utils-4.2.0 → python_utils-4.2.1}/pyproject.toml.orig

@@ -12,7 +12,7 @@ source-include = ['_python_utils_tests/**/*.py', 'conftest.py', 'tox.ini']
 
 [project]
 name = 'python-utils'
-version = "4.2.0" # static; the single source of truth. Bump via `uv version`.
+version = "4.2.1" # static; the single source of truth. Bump via `uv version`.
 description = 'Python Utils is a module with some convenient utilities not included with the standard Python install'
 readme = 'README.md'
 requires-python = '>=3.10'
@@ -52,6 +52,7 @@ Documentation = 'https://python-utils.readthedocs.io/'
 Repository = 'https://github.com/WoLpH/python-utils'
 Changelog = 'https://github.com/WoLpH/python-utils/releases'
 Funding = 'https://github.com/sponsors/wolph'
+Issues = 'https://github.com/wolph/python-utils/issues'
 
 [project.optional-dependencies]
 loguru = ['loguru']
@@ -124,6 +125,9 @@ addopts = [
 ]
 doctest_optionflags = ['ALLOW_UNICODE', 'ALLOW_BYTES']
 asyncio_mode = 'strict'
+# pytest-asyncio 1.4 warns when this is unset, and filterwarnings turns the
+# warning into an INTERNALERROR. 'function' is the scope it already used.
+asyncio_default_fixture_loop_scope = 'function'
 xfail_strict = true
 filterwarnings = [
     'error',

{python_utils-4.2.0 → python_utils-4.2.1}/python_utils/import_.py

@@ -113,24 +113,44 @@ def import_global(  # noqa: C901
                 globals_ = frame.f_globals
 
         try:
-            # Relative imports are supported (from .spam import eggs)
+            # Relative imports are supported (from .spam import eggs). Each
+            # leading dot counts as one level, so ``..spam`` goes up two.
+            # An empty or dots-only name keeps the one-level path it had in
+            # 4.2.0, and with it the IndexError or ModuleNotFoundError.
+            multi_dot: bool = False
             if not name_parts[0]:
-                name_parts = name_parts[1:]
-                level = 1
-
-            # raise IOError((name, level))
-            module = __import__(
-                name=name_parts[0] or '.',
-                globals=globals_,
-                locals=locals_,
-                fromlist=name_parts[1:],
-                level=max(level, 0),
-            )
-
-            # Make sure we get the right part of a dotted import (i.e.
-            # spam.eggs should return eggs, not spam)
-            for attr in name_parts[1:]:
-                module = _get_attribute(module, attr, '.'.join(name_parts))
+                remainder: str = name.lstrip('.')
+                dots: int = len(name) - len(remainder)
+                if dots > 1 and remainder:
+                    multi_dot = True
+                    level = dots
+                    name_parts = remainder.split('.')
+                else:
+                    name_parts = name_parts[1:]
+                    level = 1
+
+            try:
+                module = __import__(
+                    name=name_parts[0] or '.',
+                    globals=globals_,
+                    locals=locals_,
+                    fromlist=name_parts[1:],
+                    level=max(level, 0),
+                )
+
+                # Make sure we get the right part of a dotted import (i.e.
+                # spam.eggs should return eggs, not spam)
+                for attr in name_parts[1:]:
+                    module = _get_attribute(module, attr, '.'.join(name_parts))
+            except ImportError as error:
+                # Every multi-dot name failed with ModuleNotFoundError in
+                # 4.2.0. Python raises a plain ImportError for some of them,
+                # such as going above the top-level package, which
+                # `except ModuleNotFoundError` misses. The subclass is
+                # caught by both.
+                if not multi_dot or isinstance(error, ModuleNotFoundError):
+                    raise
+                raise ModuleNotFoundError(str(error), name=name) from error
 
             # If no list of modules is given, autodetect from either __all__
             # or a dir() of the module