Mercurial Repositories > eric / file diff

--- a/src/eric7/VirtualEnv/VirtualenvConfigurationDialog.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/VirtualEnv/VirtualenvConfigurationDialog.py	Sun Dec 18 19:33:46 2022 +0100
@@ -14,9 +14,10 @@
 from PyQt6.QtCore import QProcess, QTimer, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
 
-from eric7 import CondaInterface, Globals, Preferences, Utilities
+from eric7 import CondaInterface, Preferences
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7.SystemUtilities import FileSystemUtilities, OSUtilities, PythonUtilities
 
 from .Ui_VirtualenvConfigurationDialog import Ui_VirtualenvConfigurationDialog
 
@@ -40,7 +41,7 @@
         self.setupUi(self)
 
         if not baseDir:
-            baseDir = Utilities.getHomeDir()
+            baseDir = OSUtilities.getHomeDir()
         self.__envBaseDir = baseDir
 
         self.targetDirectoryPicker.setMode(EricPathPickerModes.DIRECTORY_MODE)
@@ -54,29 +55,29 @@
         self.extraSearchPathPicker.setWindowTitle(
             self.tr("Extra Search Path for setuptools/pip")
         )
-        self.extraSearchPathPicker.setDefaultDirectory(Utilities.getHomeDir())
+        self.extraSearchPathPicker.setDefaultDirectory(OSUtilities.getHomeDir())
 
         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.condaTargetDirectoryPicker.setMode(EricPathPickerModes.DIRECTORY_MODE)
         self.condaTargetDirectoryPicker.setWindowTitle(
             self.tr("Conda Environment Location")
         )
-        self.condaTargetDirectoryPicker.setDefaultDirectory(Utilities.getHomeDir())
+        self.condaTargetDirectoryPicker.setDefaultDirectory(OSUtilities.getHomeDir())
 
         self.condaCloneDirectoryPicker.setMode(EricPathPickerModes.DIRECTORY_MODE)
         self.condaCloneDirectoryPicker.setWindowTitle(
             self.tr("Conda Environment Location")
         )
-        self.condaCloneDirectoryPicker.setDefaultDirectory(Utilities.getHomeDir())
+        self.condaCloneDirectoryPicker.setDefaultDirectory(OSUtilities.getHomeDir())
 
         self.condaRequirementsFilePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
         self.condaRequirementsFilePicker.setWindowTitle(
             self.tr("Conda Requirements File")
         )
-        self.condaRequirementsFilePicker.setDefaultDirectory(Utilities.getHomeDir())
+        self.condaRequirementsFilePicker.setDefaultDirectory(OSUtilities.getHomeDir())
         self.condaRequirementsFilePicker.setFilters(
             self.tr("Text Files (*.txt);;All Files (*)")
         )
@@ -323,7 +324,10 @@
             )
         calls.extend(
             [
-                (Globals.getPythonExecutable(), ["-m", "virtualenv", "--version"]),
+                (
+                    PythonUtilities.getPythonExecutable(),
+                    ["-m", "virtualenv", "--version"],
+                ),
                 ("virtualenv", ["--version"]),
             ]
         )
@@ -379,7 +383,7 @@
             calls.append((self.pythonExecPicker.text(), ["-m", "venv"]))
         calls.extend(
             [
-                (Globals.getPythonExecutable(), ["-m", "venv"]),
+                (PythonUtilities.getPythonExecutable(), ["-m", "venv"]),
                 ("python3", ["-m", "venv"]),
                 ("python", ["-m", "venv"]),
             ]
@@ -446,7 +450,7 @@
         @return target directory path
         @rtype str
         """
-        targetDirectory = Utilities.toNativeSeparators(
+        targetDirectory = FileSystemUtilities.toNativeSeparators(
             self.targetDirectoryPicker.text()
         )
         if not os.path.isabs(targetDirectory):
@@ -488,7 +492,7 @@
                 if self.extraSearchPathPicker.text():
                     args.append(
                         "--extra-search-dir={0}".format(
-                            Utilities.toNativeSeparators(
+                            FileSystemUtilities.toNativeSeparators(
                                 self.extraSearchPathPicker.text()
                             )
                         )
@@ -502,7 +506,9 @@
                 if self.pythonExecPicker.text():
                     args.append(
                         "--python={0}".format(
-                            Utilities.toNativeSeparators(self.pythonExecPicker.text())
+                            FileSystemUtilities.toNativeSeparators(
+                                self.pythonExecPicker.text()
+                            )
                         )
                     )
                 elif self.versionComboBox.currentText():
@@ -583,7 +589,7 @@
                     "createLog": self.logCheckBox.isChecked(),
                     "createScript": self.scriptCheckBox.isChecked(),
                     "targetDirectory": self.__generateTargetDir(),
-                    "pythonExe": Utilities.toNativeSeparators(
+                    "pythonExe": FileSystemUtilities.toNativeSeparators(
                         self.pythonExecPicker.text()
                     ),
                 }