fix #32

Author: ClericPy

README.md

@@ -78,7 +78,7 @@ So, what could `zipapps` be?
 ## 4. Activate the `.pyz` environment
 
 1. use `zipimport` (Recommended)
-   1. `zipimport.zipimporter("some_lib_venv.pyz").find_spec("ensure_zipapps").loader.load_module("ensure_zipapps")`
+   1. `sys.path.append("some_lib_venv.pyz");importlib.import_module("ensure_zipapps")`
    2. automatically unzip cache, and add the path to sys.path
       1. it can be run multiple times
 2. if they are all pure-python code and **no need to decompress**

test_utils.py

@@ -404,12 +404,12 @@ 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
-    spec = zipimport.zipimporter("bottle_env.pyz").find_spec("ensure_zipapps")
-    if spec and spec.loader:
-        spec.loader.load_module("ensure_zipapps")
+    sys.path.append("bottle_env.pyz")
+    importlib.import_module("ensure_zipapps")
     import bottle
 
     # using app unzip cache for `import ensure_zipapps`

zipapps/activate_zipapps.py

@@ -1,22 +1,21 @@
+import importlib
+import sys
 import zipfile
-import zipimport
 from pathlib import Path
-from sys import modules, stderr
 
 
 def activate(path=None):
     path = Path(path) if path else Path(__file__).parent
     path_str = path.absolute().as_posix()
     if zipfile.is_zipfile(path_str):
         try:
-            spec = zipimport.zipimporter(path_str).find_spec("ensure_zipapps")
-            if spec and spec.loader:
-                _tmp = spec.loader.load_module("ensure_zipapps")
-                modules.pop(_tmp.__name__, None)
-                del _tmp
-                return True
-            else:
-                raise ImportError(path_str)
+            sys.path.insert(0, path_str)
+            ensure_zipapps = importlib.import_module("ensure_zipapps")
+            del ensure_zipapps
+            sys.modules.pop("ensure_zipapps", None)
         except ImportError as err:
-            stderr.write(f"WARNING: activate failed for {err!r}\n")
+            sys.stderr.write(f"WARNING: activate failed for {err!r}\n")
             raise err
+        finally:
+            if sys.path[0] == path_str:
+                sys.path.pop(0)