- fix deprecated warning since 3.10 zipimporter.load_module

Author: ClericPy

.github/workflows/pythonpackage.yml

@@ -70,5 +70,5 @@ jobs:
                   python -m pip install .
             - name: Test with pytest
               run: |
-                  pip install pytest uv
-                  pytest -x
+                  pip install uv
+                  uvx pytest -x

changelog.md

@@ -11,8 +11,9 @@
     - Can also be used as `uvx zipapps ...`
     - Or `zipapps.exe ...` on Windows, or `zipapps` on Unix
   - Added `--uv` option to accept a path to uv, speeding up `pip install`
+    - `--uv=uv` or `--uv=path/to/uv`
   - Added `--freeze-deps` as an alias for `--freeze-reqs`
-  - fix Deprecated since 3.10 `zipimporter.load_module`
+  - fix deprecated warning since 3.10 `zipimporter.load_module`
 - 2024.08.07
   - [**Compatible WARNING**]: update `sys_paths` insert index from `-1` to `0`
   - disable `--download-python`, use `python -m zipapps.download_python` instead

test_utils.py

@@ -40,9 +40,11 @@ def test_quiet_mode():
 def test_freeze():
     # test --freeze-reqs
     _clean_paths(root=False)
-    output = subprocess.check_output(
-        [sys.executable, "-m", "zipapps", "--freeze-reqs", "-", "six==1.16.0"]
-    )
+    output = subprocess.Popen(
+        [sys.executable, "-m", "zipapps", "--freeze-reqs", "-", "six==1.16.0"],
+        stderr=subprocess.STDOUT,
+        stdout=subprocess.PIPE,
+    ).communicate()[0]
     assert b"six==1.16.0" in output.strip(), output
 
 
@@ -405,6 +407,7 @@ def test_unzip_with_auto_unzip():
 def test_env_usage():
     # test ensure path for venv usage
     import importlib
+
     _clean_paths(root=False)
     create_app(output="bottle_env.pyz", unzip="bottle", pip_args=["bottle"])
     # activate sys.path and unzip cache
@@ -644,21 +647,25 @@ def test_chmod():
         _clean_paths(root=False)
         app_path = create_app(unzip="*", pip_args=["six"], lazy_install=True)
         subprocess.Popen([sys.executable, str(app_path), "--activate-zipapps"]).wait()
-        assert Path("app.pyz").stat().st_mode != 33279
+        temp = oct(app_path.stat().st_mode)[-3:]
+        assert temp != "777", temp
         for _path in Path("zipapps_cache/app").rglob("*"):
             if _path.name == "six.py":
-                assert _path.stat().st_mode != 33279, _path.stat().st_mode
+                temp = oct(_path.stat().st_mode)[-3:]
+                assert temp != "777", temp
                 break
 
         _clean_paths(root=False)
         app_path = create_app(
             unzip="*", pip_args=["six"], lazy_install=True, chmod="777"
         )
         subprocess.Popen([sys.executable, str(app_path), "--activate-zipapps"]).wait()
-        assert Path("app.pyz").stat().st_mode == 33279
+        temp = oct(app_path.stat().st_mode)[-3:]
+        assert temp == "777", temp
         for _path in Path("zipapps_cache/app").rglob("*"):
             if _path.name == "six.py":
-                assert _path.stat().st_mode == 33279, _path.stat().st_mode
+                temp = oct(_path.stat().st_mode)[-3:]
+                assert temp == "777", temp
                 break
 
 

zipapps/activate_zipapps.py

@@ -1,4 +1,4 @@
-import importlib
+import zipimport
 import sys
 import zipfile
 from pathlib import Path
@@ -9,9 +9,14 @@ def activate(path=None):
     path_str = path.absolute().as_posix()
     if zipfile.is_zipfile(path_str):
         try:
-            ensure_zipapps = importlib.import_module("ensure_zipapps")
-            del ensure_zipapps
-            sys.modules.pop("ensure_zipapps", None)
+            importer = zipimport.zipimporter(path_str)
+            spec = importer.find_spec("ensure_zipapps")
+            if spec and spec.loader is not None:
+                ensure_zipapps = spec.loader.load_module("ensure_zipapps")
+                del ensure_zipapps
+                sys.modules.pop("ensure_zipapps", None)
+            else:
+                raise ImportError(f"Cannot find 'ensure_zipapps' in {path_str!r}")
         except ImportError as err:
             sys.stderr.write(f"WARNING: activate failed for {err!r}\n")
             raise err