Mercurial Repositories > eric / file diff

--- a/src/eric7/VirtualEnv/VirtualenvAddEditDialog.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/VirtualEnv/VirtualenvAddEditDialog.py	Sun Dec 18 19:33:46 2022 +0100
@@ -12,8 +12,8 @@
 from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
 
-from eric7 import Globals, Utilities
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7.SystemUtilities import OSUtilities, PythonUtilities
 
 from .Ui_VirtualenvAddEditDialog import Ui_VirtualenvAddEditDialog
 
@@ -78,7 +78,7 @@
 
         self.__envBaseDir = baseDir
         if not self.__envBaseDir:
-            self.__envBaseDir = Utilities.getHomeDir()
+            self.__envBaseDir = OSUtilities.getHomeDir()
 
         self.targetDirectoryPicker.setMode(EricPathPickerModes.DIRECTORY_MODE)
         self.targetDirectoryPicker.setWindowTitle(
@@ -88,7 +88,7 @@
 
         self.pythonExecPicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
         self.pythonExecPicker.setWindowTitle(self.tr("Python Interpreter"))
-        self.pythonExecPicker.setDefaultDirectory(Globals.getPythonExecutable())
+        self.pythonExecPicker.setDefaultDirectory(PythonUtilities.getPythonExecutable())
 
         self.execPathEdit.setToolTip(
             self.tr(
@@ -167,7 +167,7 @@
         """
         if venvDirectory:
             # try to determine a Python interpreter name
-            if Utilities.isWindowsPlatform():
+            if OSUtilities.isWindowsPlatform():
                 candidates = (
                     os.path.join(venvDirectory, "Scripts", "python.exe"),
                     os.path.join(venvDirectory, "python.exe"),
@@ -203,7 +203,9 @@
         if txt:
             self.pythonExecPicker.setDefaultDirectory(txt)
         else:
-            self.pythonExecPicker.setDefaultDirectory(Globals.getPythonExecutable())
+            self.pythonExecPicker.setDefaultDirectory(
+                PythonUtilities.getPythonExecutable()
+            )
         py = self.__detectPythonInterpreter(txt)
         if py:
             self.pythonExecPicker.setText(py)
@@ -248,7 +250,7 @@
         """
         if checked and not bool(self.execPathEdit.text()):
             # prepopulate the execPathEdit widget
-            if Utilities.isWindowsPlatform():
+            if OSUtilities.isWindowsPlatform():
                 self.execPathEdit.setText(
                     os.pathsep.join(
                         [