Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py	Sun Dec 18 19:33:46 2022 +0100
@@ -19,10 +19,11 @@
 from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem, QTreeWidgetItem
 
-from eric7 import Preferences, Utilities
+from eric7 import Preferences
 from eric7.EricWidgets import EricFileDialog
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7.SystemUtilities import FileSystemUtilities, OSUtilities
 
 from .AddEntryPointDialog import AddEntryPointDialog
 from .AddProjectUrlDialog import AddProjectUrlDialog
@@ -400,7 +401,9 @@
             )
 
         sourceCode += "{0}packages=find_packages(".format(istring)
-        src = Utilities.fromNativeSeparators(self.sourceDirectoryPicker.text())
+        src = FileSystemUtilities.fromNativeSeparators(
+            self.sourceDirectoryPicker.text()
+        )
         excludePatterns = []
         for row in range(self.excludePatternList.count()):
             excludePatterns.append(self.excludePatternList.item(row).text())
@@ -554,7 +557,9 @@
             options["python_requires"] = self.pyVersionEdit.text()
 
         findOptions = {}
-        src = Utilities.fromNativeSeparators(self.sourceDirectoryPicker.text())
+        src = FileSystemUtilities.fromNativeSeparators(
+            self.sourceDirectoryPicker.text()
+        )
         excludePatterns = []
         for row in range(self.excludePatternList.count()):
             excludePatterns.append(self.excludePatternList.item(row).text())
@@ -771,7 +776,9 @@
             setuptools["py-modules"] = modulesArray
 
         findspec = tomlkit.table()
-        src = Utilities.fromNativeSeparators(self.sourceDirectoryPicker.text())
+        src = FileSystemUtilities.fromNativeSeparators(
+            self.sourceDirectoryPicker.text()
+        )
         excludePatterns = []
         for row in range(self.excludePatternList.count()):
             excludePatterns.append(self.excludePatternList.item(row).text())
@@ -862,7 +869,7 @@
         @return start directory
         @rtype str
         """
-        return Preferences.getMultiProject("Workspace") or Utilities.getHomeDir()
+        return Preferences.getMultiProject("Workspace") or OSUtilities.getHomeDir()
 
     @pyqtSlot()
     def on_entryPointsList_itemSelectionChanged(self):
@@ -951,7 +958,9 @@
             self.tr("Python Files (*.py)"),
         )
         for module in modulesList:
-            module = module.replace(Utilities.toNativeSeparators(startDir), "")
+            module = module.replace(
+                FileSystemUtilities.toNativeSeparators(startDir), ""
+            )
             if module.startswith(("\\", "/")):
                 module = module[1:]
             if module: