Mercurial Repositories > eric / file diff

--- a/src/eric7/eric7_api.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/eric7_api.py	Sun Dec 18 19:33:46 2022 +0100
@@ -18,8 +18,9 @@
 import os
 import sys
 
-from eric7 import DocumentationTools, Utilities
+from eric7 import DocumentationTools
 from eric7.DocumentationTools.APIGenerator import APIGenerator
+from eric7.SystemUtilities import FileSystemUtilities, OSUtilities
 from eric7.UI.Info import Version
 from eric7.Utilities import ModuleParser
 
@@ -229,7 +230,7 @@
         for arg in args:
             if os.path.isdir(arg):
                 if os.path.exists(
-                    os.path.join(arg, Utilities.joinext("__init__", ".py"))
+                    os.path.join(arg, FileSystemUtilities.joinext("__init__", ".py"))
                 ):
                     basename = os.path.dirname(arg)
                     if arg == ".":
@@ -245,7 +246,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:
@@ -259,11 +260,13 @@
                     for ext in supportedExtensions:
                         files.extend(
                             glob.glob(
-                                os.path.join(filename, Utilities.joinext("*", ext))
+                                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
@@ -273,7 +276,7 @@
                             # assume package
                             inpackage = True
                 else:
-                    if Utilities.isWindowsPlatform() and glob.has_magic(filename):
+                    if OSUtilities.isWindowsPlatform() and glob.has_magic(filename):
                         files = glob.glob(filename)
                     else:
                         files = [filename]