Mercurial Repositories > eric / file diff

diff -r fd00ad18a98d -r 9f15464daafa src/eric7/VirtualEnv/VirtualenvConfigurationDialog.py
--- a/src/eric7/VirtualEnv/VirtualenvConfigurationDialog.py	Wed Dec 04 14:54:29 2024 +0100
+++ b/src/eric7/VirtualEnv/VirtualenvConfigurationDialog.py	Thu Dec 05 16:54:37 2024 +0100
@@ -17,7 +17,7 @@
 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 eric7.SystemUtilities import PythonUtilities
 
 from .Ui_VirtualenvConfigurationDialog import Ui_VirtualenvConfigurationDialog
 
@@ -41,7 +41,7 @@
         self.setupUi(self)
 
         if not baseDir:
-            baseDir = OSUtilities.getHomeDir()
+            baseDir = os.path.expanduser("~")
         self.__envBaseDir = baseDir
 
         self.targetDirectoryPicker.setMode(EricPathPickerModes.DIRECTORY_MODE)
@@ -55,7 +55,7 @@
         self.extraSearchPathPicker.setWindowTitle(
             self.tr("Extra Search Path for setuptools/pip")
         )
-        self.extraSearchPathPicker.setDefaultDirectory(OSUtilities.getHomeDir())
+        self.extraSearchPathPicker.setDefaultDirectory(os.path.expanduser("~"))
 
         self.pythonExecPicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
         self.pythonExecPicker.setWindowTitle(self.tr("Python Interpreter"))
@@ -65,19 +65,19 @@
         self.condaTargetDirectoryPicker.setWindowTitle(
             self.tr("Conda Environment Location")
         )
-        self.condaTargetDirectoryPicker.setDefaultDirectory(OSUtilities.getHomeDir())
+        self.condaTargetDirectoryPicker.setDefaultDirectory(os.path.expanduser("~"))
 
         self.condaCloneDirectoryPicker.setMode(EricPathPickerModes.DIRECTORY_MODE)
         self.condaCloneDirectoryPicker.setWindowTitle(
             self.tr("Conda Environment Location")
         )
-        self.condaCloneDirectoryPicker.setDefaultDirectory(OSUtilities.getHomeDir())
+        self.condaCloneDirectoryPicker.setDefaultDirectory(os.path.expanduser("~"))
 
         self.condaRequirementsFilePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
         self.condaRequirementsFilePicker.setWindowTitle(
             self.tr("Conda Requirements File")
         )
-        self.condaRequirementsFilePicker.setDefaultDirectory(OSUtilities.getHomeDir())
+        self.condaRequirementsFilePicker.setDefaultDirectory(os.path.expanduser("~"))
         self.condaRequirementsFilePicker.setFilters(
             self.tr("Text Files (*.txt);;All Files (*)")
         )
@@ -450,9 +450,7 @@
         @return target directory path
         @rtype str
         """
-        targetDirectory = FileSystemUtilities.toNativeSeparators(
-            self.targetDirectoryPicker.text()
-        )
+        targetDirectory = self.targetDirectoryPicker.text()
         if not os.path.isabs(targetDirectory):
             targetDirectory = os.path.join(os.path.expanduser("~"), targetDirectory)
         return targetDirectory
@@ -492,9 +490,7 @@
                 if self.extraSearchPathPicker.text():
                     args.append(
                         "--extra-search-dir={0}".format(
-                            FileSystemUtilities.toNativeSeparators(
-                                self.extraSearchPathPicker.text()
-                            )
+                            self.extraSearchPathPicker.text()
                         )
                     )
                 if self.promptPrefixEdit.text():
@@ -506,9 +502,7 @@
                 if self.pythonExecPicker.text():
                     args.append(
                         "--python={0}".format(
-                            FileSystemUtilities.toNativeSeparators(
-                                self.pythonExecPicker.text()
-                            )
+                            self.pythonExecPicker.text()
                         )
                     )
                 elif self.versionComboBox.currentText():
@@ -589,9 +583,7 @@
                     "createLog": self.logCheckBox.isChecked(),
                     "createScript": self.scriptCheckBox.isChecked(),
                     "targetDirectory": self.__generateTargetDir(),
-                    "pythonExe": FileSystemUtilities.toNativeSeparators(
-                        self.pythonExecPicker.text()
-                    ),
+                    "pythonExe": self.pythonExecPicker.text(),
                 }
             )