omdev 0.0.0.dev63__py3-none-any.whl → 0.0.0.dev65__py3-none-any.whl

omdev/cli/managers.py

@@ -1,6 +1,5 @@
 import enum
 import os.path
-import site
 import sys
 
 
@@ -44,47 +43,6 @@ def detect_install_manager(cli_pkg: str) -> ManagerType | None:
     return None
 
 
-##
-# Python is insistent on prepending sys.path with an empty string (translating to the current working directory),
-# which leads to problems when using the cli in directories containing python packages (such as within this very
-# source tree). This can't be done in cli main as the code frequently spawns other sys.executable processes which
-# wouldn't know to do that, so a .pth file hack is used. Cleaning sys.path solely there is also insufficient as that
-# code runs before the problematic empty string is added, so a sys.meta_path hook is prepended.
-#
-# See:
-#   https://github.com/python/cpython/blob/da1e5526aee674bb33c17a498aa3781587b9850c/Python/sysmodule.c#L3939
-
-
-def _remove_empty_from_sys_path() -> None:
-    while '' in sys.path:
-        sys.path.remove('')
-
-
-class _PathHackMetaFinder:
-    def find_spec(self, fullname, path, target=None):
-        _remove_empty_from_sys_path()
-        return None  # noqa
-
-
-def _activate_path_hack() -> None:
-    if not any(isinstance(mp, _PathHackMetaFinder) for mp in sys.meta_path):
-        sys.meta_path.insert(0, _PathHackMetaFinder())
-
-
-_PATH_HACK_FILE_NAME = f'{"-".join(__name__.split("."))}-path-hack.pth'
-
-
-def _install_path_hack_file() -> None:
-    sp = site.getsitepackages()[0]
-    if os.path.isfile(fp := os.path.join(sp, _PATH_HACK_FILE_NAME)):
-        return
-
-    with open(fp, 'w') as f:
-        f.write(f'import {__name__}; {__name__}._activate_path_hack()')
-
-    _activate_path_hack()
-
-
 ##
 
 
@@ -92,4 +50,5 @@ def setup_install_manager(cli_pkg: str) -> None:
     if detect_install_manager(cli_pkg) is None:
         return
 
-    _install_path_hack_file()
+    from .pathhack import _install_pth_file
+    _install_pth_file()

omdev/cli/pathhack.py

@@ -0,0 +1,43 @@
+"""
+Python is insistent on prepending sys.path with an empty string (translating to the current working directory), which
+leads to problems when using the cli in directories containing python packages (such as within this very source tree).
+This can't be done in cli main as the code frequently spawns other sys.executable processes which wouldn't know to do
+that, so a .pth file hack is used. Cleaning sys.path solely there is also insufficient as that code runs before thej
+problematic empty string is added, so a sys.meta_path hook is prepended.
+
+See:
+  https://github.com/python/cpython/blob/da1e5526aee674bb33c17a498aa3781587b9850c/Python/sysmodule.c#L3939
+"""
+import os.path
+import site
+import sys
+
+
+def _remove_empty_from_sys_path() -> None:
+    while '' in sys.path:
+        sys.path.remove('')
+
+
+class _PathHackMetaFinder:
+    def find_spec(self, fullname, path, target=None):
+        _remove_empty_from_sys_path()
+        return None  # noqa
+
+
+def _activate_path_hack() -> None:
+    if not any(isinstance(mp, _PathHackMetaFinder) for mp in sys.meta_path):
+        sys.meta_path.insert(0, _PathHackMetaFinder())
+
+
+_PTH_FILE_NAME = f'omlish-{"-".join(__package__.split(".")[1:])}-pathhack.pth'
+
+
+def _install_pth_file() -> None:
+    sp = site.getsitepackages()[0]
+    if os.path.isfile(fp := os.path.join(sp, _PTH_FILE_NAME)):
+        return
+
+    with open(fp, 'w') as f:
+        f.write(f'import {__name__}; {__name__}._activate_path_hack()')
+
+    _activate_path_hack()