Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Sun Dec 18 19:33:46 2022 +0100
@@ -14,13 +14,13 @@
 from PyQt6.QtGui import QColor
 from PyQt6.QtWidgets import QColorDialog, QDialog, QDialogButtonBox
 
-from eric7 import Globals, Utilities
 from eric7.DocumentationTools.Config import (
     eric7docColorParameterNames,
     eric7docDefaultColors,
 )
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
 from eric7.Globals import getConfig
+from eric7.SystemUtilities import FileSystemUtilities, PythonUtilities
 
 from .Ui_EricdocConfigDialog import Ui_EricdocConfigDialog
 
@@ -94,21 +94,23 @@
                     self.colors[key] = parms[key]
                 else:
                     self.parameters[key] = parms[key]
-        self.parameters["startDirectory"] = Utilities.toNativeSeparators(
+        self.parameters["startDirectory"] = FileSystemUtilities.toNativeSeparators(
             self.parameters["startDirectory"]
         )
-        self.parameters["outputDirectory"] = Utilities.toNativeSeparators(
+        self.parameters["outputDirectory"] = FileSystemUtilities.toNativeSeparators(
             self.parameters["outputDirectory"]
         )
-        self.parameters["qtHelpOutputDirectory"] = Utilities.toNativeSeparators(
+        self.parameters[
+            "qtHelpOutputDirectory"
+        ] = FileSystemUtilities.toNativeSeparators(
             self.parameters["qtHelpOutputDirectory"]
         )
-        self.parameters["cssFile"] = Utilities.toNativeSeparators(
+        self.parameters["cssFile"] = FileSystemUtilities.toNativeSeparators(
             self.parameters["cssFile"]
         )
         if self.parameters["cssFile"].startswith("%PYTHON%"):
             self.parameters["cssFile"] = self.parameters["cssFile"].replace(
-                "%PYTHON%", Utilities.getPythonLibraryDirectory()
+                "%PYTHON%", PythonUtilities.getPythonLibraryDirectory()
             )
 
         self.ppath = project.getProjectPath()
@@ -185,8 +187,10 @@
         args = []
 
         # 1. the program name
-        args.append(Globals.getPythonExecutable())
-        args.append(Utilities.normabsjoinpath(getConfig("ericDir"), "eric7_doc.py"))
+        args.append(PythonUtilities.getPythonExecutable())
+        args.append(
+            FileSystemUtilities.normabsjoinpath(getConfig("ericDir"), "eric7_doc.py")
+        )
 
         # 2. the commandline options
         # 2a. general commandline options
@@ -236,11 +240,11 @@
         # 2b. style commandline options
         if self.parameters["cssFile"] != self.defaults["cssFile"]:
             cssFile = self.project.getRelativePath(self.parameters["cssFile"])
-            if cssFile.startswith(Utilities.getPythonLibraryDirectory()):
+            if cssFile.startswith(PythonUtilities.getPythonLibraryDirectory()):
                 cssFile = cssFile.replace(
-                    Utilities.getPythonLibraryDirectory(), "%PYTHON%"
+                    PythonUtilities.getPythonLibraryDirectory(), "%PYTHON%"
                 )
-            parms["cssFile"] = Utilities.fromNativeSeparators(cssFile)
+            parms["cssFile"] = FileSystemUtilities.fromNativeSeparators(cssFile)
             args.append("-c")
             if os.path.isabs(self.parameters["cssFile"]):
                 args.append(self.parameters["cssFile"])