Minor changes

TheCavaco · Sep 17, 2022 · c0ef74e · c0ef74e
1 parent dfdce3d
commit c0ef74e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 24 deletions.
diff --git a/pyjl/external/modules/ctypes.py b/pyjl/external/modules/ctypes.py
@@ -18,7 +18,7 @@ def visit_load_library(self, node: ast.Call, vargs: list[str], kwargs: list[tupl
     def visit_pythonapi(self, node: ast.Call, vargs: list[str], kwargs: list[tuple[str,str]]):
         self._usings.add("Libdl")
         # Get path of the dll for Python 3.9
-        python_39 = get_python_dll_path((3, 9))
+        python_39 = JuliaExternalModulePlugins._get_python_dll_path((3, 9))
         self._globals.add(f"pythonapi = Libdl.dlopen({python_39})")
         func = self.visit(node.func)
         if getattr(node, "in_ccall", None):
@@ -27,6 +27,20 @@ def visit_pythonapi(self, node: ast.Call, vargs: list[str], kwargs: list[tuple[s
             return f"(argtypes, return_type, args) -> @ccall (Libdl.dlsym(pythonapi, :{func}), return_type, argtypes, args)"
         return f"ccall({', '.join(vargs)})"
 
+    def _get_python_dll_path(version: tuple[str, str]):
+        """Receives major and minor version information 
+        and returns the corresponding Python DLL path"""
+        if len(version) != 2:
+            return None
+        # Checks the path of the dll for Python 
+        # given a version number
+        version_str = f"{version[0]}{version[1]}"
+        python_path = subprocess.check_output(f'where python{version_str}.dll').decode().strip().split("\n")
+        python_path = python_path[1] \
+            if len(python_path) > 1 \
+            else python_path[0]
+        return f"\"{'/'.join(python_path.strip().split(os.sep))}\""
+
     def visit_cast(self, node: ast.Call, vargs: list[str], kwargs: list[tuple[str,str]]):
         self._usings.add("Libdl")
         return f"Base.cconvert({self._map_type(vargs[1])}, {vargs[0]})"

diff --git a/pyjl/helpers.py b/pyjl/helpers.py
@@ -162,25 +162,3 @@ def pycall_import(self, node: ast.Call, mod_name: str, opt_name: Optional[str] =
         self._pycall_imports.add(mod_name)
         import_stmt = f'{mod_name} = pyimport("{mod_name}")'
     self._globals.add(import_stmt)
-
-def get_python_dll_path(version: tuple[str, str]):
-    """Receives major and minor version information 
-    and returns the corresponding Python DLL path"""
-    if len(version) != 2:
-        return None
-    # Checks the path of the dll for Python 
-    # given a version number
-    version_str = f"{version[0]}{version[1]}"
-    python_path = subprocess.check_output(f'where python{version_str}.dll').decode().strip().split("\n")
-    python_path = python_path[1] \
-        if len(python_path) > 1 \
-        else python_path[0]
-    return f"\"{'/'.join(python_path.strip().split(os.sep))}\""
-
-def get_python_exe_path():
-    """Returns the Python exe path"""
-    python_path = subprocess.check_output(f'where python.exe').decode().strip().split("\n")
-    python_path = python_path[1] \
-        if len(python_path) > 1 \
-        else python_path[0]
-    return f"\"{'/'.join(python_path.strip().split(os.sep))}\""
diff --git a/pyjl/plugins.py b/pyjl/plugins.py
@@ -1608,7 +1608,7 @@ def visit_Attribute(self, node: ast.Attribute) -> Any:
         True,
     ),
     sys.maxsize: (lambda self, node, vargs, kwargs: "typemax(Int)", True),
-    # TODO: Change sys.executable for "get_python_exe_path" Python dir
+    # TODO: Change sys.executable for python.exe path
     sys.executable: (lambda self, node, vargs, kwargs: "joinpath(Base.Sys.BINDIR, Base.julia_exename())", True),
     # calls invoking PyCall
     tempfile.mkdtemp: (JuliaTranspilerPlugins.visit_tempfile, True),