Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/PluginEricdoc.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/Plugins/PluginEricdoc.py	Sun Dec 18 19:33:46 2022 +0100
@@ -12,10 +12,16 @@
 from PyQt6.QtCore import QCoreApplication, QObject
 from PyQt6.QtWidgets import QDialog
 
-from eric7 import Preferences, Utilities
+from eric7 import Preferences
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Globals import getConfig
+from eric7.SystemUtilities import (
+    FileSystemUtilities,
+    OSUtilities,
+    PythonUtilities,
+    QtUtilities,
+)
 from eric7.UI import Info
 
 # Start-Of-Header
@@ -49,10 +55,10 @@
 
     # 1. eric7_doc
     exe = "eric7_doc"
-    if Utilities.isWindowsPlatform():
+    if OSUtilities.isWindowsPlatform():
         for exepath in (
             getConfig("bindir"),
-            Utilities.getPythonScriptsDirectory(),
+            PythonUtilities.getPythonScriptsDirectory(),
         ):
             found = False
             for ext in (".exe", ".cmd", ".bat"):
@@ -66,7 +72,7 @@
     else:
         for exepath in (
             getConfig("bindir"),
-            Utilities.getPythonScriptsDirectory(),
+            PythonUtilities.getPythonScriptsDirectory(),
         ):
             exe_ = os.path.join(exepath, exe)
             if os.path.exists(exe_):
@@ -95,16 +101,16 @@
     if not exe:
         # 2.2 location before 6.3 (Linux and macOS) and Windows
         exe = os.path.join(
-            Utilities.getQtBinariesPath(),
-            Utilities.generateQtToolName("qhelpgenerator"),
+            QtUtilities.getQtBinariesPath(),
+            QtUtilities.generateQtToolName("qhelpgenerator"),
         )
-        if Utilities.isWindowsPlatform():
+        if OSUtilities.isWindowsPlatform():
             exe += ".exe"
         if not os.path.exists(exe):
             # 2.3 location starting with 6.3.0 (Linux and macOS)
             exe = os.path.join(
-                Utilities.getQtBinariesPath(libexec=True),
-                Utilities.generateQtToolName("qhelpgenerator"),
+                QtUtilities.getQtBinariesPath(libexec=True),
+                QtUtilities.generateQtToolName("qhelpgenerator"),
             )
 
     if exe:
@@ -240,7 +246,7 @@
             if res:
                 dia.exec()
 
-            outdir = Utilities.toNativeSeparators(parms["outputDirectory"])
+            outdir = FileSystemUtilities.toNativeSeparators(parms["outputDirectory"])
             if outdir == "":
                 outdir = "doc"  # that is eric7_docs default output dir
 
@@ -255,7 +261,9 @@
                 project.othersAdded(outdir)
 
             if parms["qtHelpEnabled"]:
-                outdir = Utilities.toNativeSeparators(parms["qtHelpOutputDirectory"])
+                outdir = FileSystemUtilities.toNativeSeparators(
+                    parms["qtHelpOutputDirectory"]
+                )
                 if outdir == "":
                     outdir = "help"
                     # that is eric7_docs default QtHelp output dir