src/eric7/VirtualEnv/VirtualenvManager.py

branch
eric7
changeset 9624
b47dfa7a137d
parent 9559
34fc53e6159d
child 9653
e67609152c5e
--- a/src/eric7/VirtualEnv/VirtualenvManager.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/VirtualEnv/VirtualenvManager.py	Sun Dec 18 19:33:46 2022 +0100
@@ -16,9 +16,10 @@
 from PyQt6.QtCore import QObject, pyqtSignal, pyqtSlot
 from PyQt6.QtWidgets import QDialog
 
-from eric7 import Globals, Preferences, Utilities
+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
+from eric7.SystemUtilities import FileSystemUtilities, PythonUtilities
 from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
 
 
@@ -107,7 +108,7 @@
             del environments[venvName]
 
         # check, if the interpreter used to run eric is in the environments
-        defaultPy = Globals.getPythonExecutable()
+        defaultPy = PythonUtilities.getPythonExecutable()
         if "{0}.venv{0}".format(os.sep) not in defaultPy:
             # only check for a non-embedded environment
             found = False
@@ -184,9 +185,9 @@
             containing a copy of the default virtual environment
         @rtype tuple of (str, dict)
         """
-        py = Utilities.normcaseabspath(interpreter.replace("w.exe", ".exe"))
+        py = FileSystemUtilities.normcaseabspath(interpreter.replace("w.exe", ".exe"))
         for venvName in self.__virtualEnvironments:
-            if py == Utilities.normcaseabspath(
+            if py == FileSystemUtilities.normcaseabspath(
                 self.__virtualEnvironments[venvName]["interpreter"]
             ):
                 return (venvName, copy.copy(self.__virtualEnvironments[venvName]))

eric ide

mercurial