diff -r 9c1f429cb56b -r b47dfa7a137d src/eric7/eric7_doc.py
--- a/src/eric7/eric7_doc.py Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/eric7_doc.py Sun Dec 18 19:33:46 2022 +0100
@@ -19,12 +19,12 @@
import shutil
import sys
-from eric7 import Utilities
from eric7.DocumentationTools import TemplatesListsStyleCSS
from eric7.DocumentationTools.Config import eric7docDefaultColors
from eric7.DocumentationTools.IndexGenerator import IndexGenerator
from eric7.DocumentationTools.ModuleDocumentor import ModuleDocument
from eric7.DocumentationTools.QtHelpGenerator import QtHelpGenerator
+from eric7.SystemUtilities import FileSystemUtilities, OSUtilities
from eric7.UI.Info import Version
from eric7.Utilities import ModuleParser
@@ -363,7 +363,9 @@
for arg in args:
if os.path.isdir(arg):
- if os.path.exists(os.path.join(arg, Utilities.joinext("__init__", ".py"))):
+ if os.path.exists(
+ os.path.join(arg, FileSystemUtilities.joinext("__init__", ".py"))
+ ):
basename = os.path.dirname(arg)
if arg == ".":
sys.stderr.write("The directory '.' is a package.\n")
@@ -376,7 +378,7 @@
basename = "{0}{1}".format(basename, os.sep)
if recursive and not os.path.islink(arg):
- names = [arg] + Utilities.getDirs(arg, excludeDirs)
+ names = [arg] + FileSystemUtilities.getDirs(arg, excludeDirs)
else:
names = [arg]
else:
@@ -389,17 +391,21 @@
files = []
for ext in supportedExtensions:
files.extend(
- glob.glob(os.path.join(filename, Utilities.joinext("*", ext)))
+ glob.glob(
+ os.path.join(
+ filename, FileSystemUtilities.joinext("*", ext)
+ )
+ )
)
initFile = os.path.join(
- filename, Utilities.joinext("__init__", ext)
+ filename, FileSystemUtilities.joinext("__init__", ext)
)
if initFile in files:
inpackage = True
files.remove(initFile)
files.insert(0, initFile)
else:
- if Utilities.isWindowsPlatform() and glob.has_magic(filename):
+ if OSUtilities.isWindowsPlatform() and glob.has_magic(filename):
files = glob.glob(filename)
else:
files = [filename]
@@ -429,7 +435,7 @@
sys.stderr.write("{0} error: {1}\n".format(file, v))
continue
- f = Utilities.joinext(
+ f = FileSystemUtilities.joinext(
os.path.join(outputDir, moduleDocument.name()), ".html"
)
