Merge pull request #32 from DavidCEllis/rework_laziness

Convert imports to use the new capture_imports context manager.

Author: DavidCEllis

pyproject.toml

@@ -15,7 +15,7 @@ readme="README.md"
 requires-python = ">=3.10"
 dependencies = [
     "ducktools-classbuilder>=0.7.1",
-    "ducktools-lazyimporter>=0.5.1",
+    "ducktools-lazyimporter>=0.7.0",
     "ducktools-scriptmetadata",
     "ducktools-pythonfinder>=0.6.0",
     "tomli; python_version < '3.11'",

src/ducktools/env/_lazy_imports.py

@@ -20,68 +20,68 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
+import sys
 
+from ducktools.lazyimporter import LazyImporter
+from ducktools.lazyimporter.capture import capture_imports
 
-from ducktools.lazyimporter import (
-    LazyImporter,
-    FromImport,
-    ModuleImport,
-    MultiFromImport,
-    TryExceptImport,
-)
+__all__ = [
+    # stdlib
+    "hashlib",
+    "json",
+    "metadata",  # importlib.metadata
+    "re",
+    "shutil",
+    "sql",
+    "subprocess",
+    "tempfile",
+    "tomllib",
+    "warnings",
+    "zipfile",
 
-laz = LazyImporter(
-    [
-        # Stdlib and dependency imports
-        ModuleImport("hashlib"),
-        ModuleImport("json"),
-        ModuleImport("re"),
-        ModuleImport("shutil"),
-        ModuleImport("sqlite3", asname="sql"),
-        ModuleImport("subprocess"),
-        ModuleImport("tempfile"),
-        ModuleImport("warnings"),
-        ModuleImport("zipfile"),
+    "TemporaryDirectory",
+    "urlopen",
 
-        MultiFromImport(
-            "ducktools.pythonfinder",
-            ["list_python_installs", "PythonInstall"],
-        ),
-        FromImport(
-            "ducktools.pythonfinder.shared",
-            "get_uv_pythons",
-            "get_installed_uv_pythons"
-        ),
-        FromImport(
-            "importlib",
-            "metadata"
-        ),
-        FromImport(
-            "tempfile",
-            "TemporaryDirectory"
-        ),
-        FromImport(
-            "urllib.request",
-            "urlopen"
-        ),
+    # Packaging
+    "Requirement",
+    "InvalidRequirement",
+    "SpecifierSet",
+    "InvalidSpecifier",
+    "Version",
+    "InvalidVersion",
 
-        MultiFromImport(
-            "packaging.requirements",
-            ["Requirement", "InvalidRequirement"],
-        ),
-        MultiFromImport(
-            "packaging.specifiers",
-            ["SpecifierSet", "InvalidSpecifier"],
-        ),
-        MultiFromImport(
-            "packaging.version",
-            ["Version", "InvalidVersion"]
-        ),
+    # ducktools-pythonfinder
+    "list_python_installs",
+    "PythonInstall",
+    "get_installed_uv_pythons",
+]
 
-        TryExceptImport(
-            "tomllib",
-            "tomli",
-            "tomllib",
-        ),
-    ],
-)
+laz = LazyImporter()
+
+
+with capture_imports(laz):
+    import hashlib
+    import importlib.metadata as metadata
+    import json
+    import re
+    import shutil
+    import sqlite3 as sql
+    import subprocess
+    import tempfile
+    import warnings
+    import zipfile
+
+    if sys.version_info >= (3, 11):
+        import tomllib as tomllib
+    else:
+        import tomli as tomllib
+
+    from tempfile import TemporaryDirectory
+    from urllib.request import urlopen
+
+    from packaging.requirements import Requirement, InvalidRequirement
+    from packaging.specifiers import SpecifierSet, InvalidSpecifier
+    from packaging.version import Version, InvalidVersion
+
+    from ducktools.pythonfinder import list_python_installs, PythonInstall
+    from ducktools.pythonfinder.shared import get_uv_pythons as get_installed_uv_pythons

src/ducktools/env/bundled_data.py

@@ -39,7 +39,7 @@
 
 from ducktools.classbuilder.prefab import Prefab, attribute
 
-from ._lazy_imports import laz as _laz
+from . import _lazy_imports as _laz
 
 
 class BundledDataError(Exception):

src/ducktools/env/catalogue.py

@@ -35,7 +35,7 @@
 from ._logger import log
 
 
-from ._lazy_imports import laz as _laz
+from . import _lazy_imports as _laz
 
 
 def _datetime_now_iso() -> str:

src/ducktools/env/config.py

@@ -28,7 +28,7 @@
 from datetime import timedelta as _timedelta
 
 from ducktools.classbuilder.prefab import Prefab, get_attributes, as_dict
-from ._lazy_imports import laz as _laz
+from . import _lazy_imports as _laz
 
 
 class Config(Prefab, kw_only=True):

src/ducktools/env/environment_specs.py

@@ -28,7 +28,7 @@
 from .exceptions import ApplicationError
 from ._logger import log
 
-from ._lazy_imports import laz as _laz
+from . import _lazy_imports as _laz
 
 
 class AppDetails(Prefab, kw_only=True):

src/ducktools/env/manager.py

@@ -49,7 +49,7 @@
 )
 from .register import RegisterManager, RegisteredScript
 
-from ._lazy_imports import laz as _laz
+from . import _lazy_imports as _laz
 from ._logger import log
 
 

src/ducktools/env/register.py

@@ -24,7 +24,7 @@
 
 from ducktools.classbuilder.prefab import Prefab
 
-from ._lazy_imports import laz as _laz
+from . import _lazy_imports as _laz
 from ._sqlclasses import SQLAttribute, SQLClass, SQLContext
 from .exceptions import ScriptNotFound
 

src/ducktools/env/scripts/get_pip.py

@@ -36,7 +36,7 @@
 from ..platform_paths import ManagedPaths
 from .._logger import log
 from ..exceptions import InvalidPipDownload
-from .._lazy_imports import laz as _laz
+from .. import _lazy_imports as _laz
 
 BASE_URL = "https://bootstrap.pypa.io/pip"
 

src/ducktools/env/scripts/get_uv.py

@@ -25,7 +25,7 @@
 
 from .get_pip import retrieve_pip
 from .._logger import log
-from .._lazy_imports import laz as _laz
+from .. import _lazy_imports as _laz
 from ..platform_paths import ManagedPaths