Mercurial Repositories > eric / file diff

--- a/src/eric7/Graphics/PackageDiagramBuilder.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/Graphics/PackageDiagramBuilder.py	Sun Dec 18 19:33:46 2022 +0100
@@ -15,8 +15,9 @@
 
 from PyQt6.QtWidgets import QApplication, QGraphicsTextItem
 
-from eric7 import Preferences, Utilities
+from eric7 import Globals, Preferences
 from eric7.EricWidgets.EricProgressDialog import EricProgressDialog
+from eric7.SystemUtilities import FileSystemUtilities
 
 from .UMLDiagramBuilder import UMLDiagramBuilder
 
@@ -96,7 +97,9 @@
         moduleDict = {}
         modules = []
         for ext in supportedExt:
-            modules.extend(glob.glob(Utilities.normjoinpath(self.package, ext)))
+            modules.extend(
+                glob.glob(FileSystemUtilities.normjoinpath(self.package, ext))
+            )
         tot = len(modules)
         progress = EricProgressDialog(
             self.tr("Parsing modules..."),
@@ -163,7 +166,7 @@
         tot = 0
         for ext in supportedExt:
             for subpackage in subpackagesList:
-                tot += len(glob.glob(Utilities.normjoinpath(subpackage, ext)))
+                tot += len(glob.glob(FileSystemUtilities.normjoinpath(subpackage, ext)))
         progress = EricProgressDialog(
             self.tr("Parsing modules..."),
             None,
@@ -183,7 +186,9 @@
                 subpackagesDict[packageName] = []
                 modules = []
                 for ext in supportedExt:
-                    modules.extend(glob.glob(Utilities.normjoinpath(subpackage, ext)))
+                    modules.extend(
+                        glob.glob(FileSystemUtilities.normjoinpath(subpackage, ext))
+                    )
                 for prog, module in enumerate(modules):
                     progress.setValue(prog)
                     if time.monotonic() - now > 0.01:
@@ -527,7 +532,7 @@
             return False
 
         self.package = parts[0].split("=", 1)[1].strip()
-        self.noAttrs = Utilities.toBool(parts[1].split("=", 1)[1].strip())
+        self.noAttrs = Globals.toBool(parts[1].split("=", 1)[1].strip())
 
         self.initialize()
 
@@ -544,9 +549,9 @@
             "project_name": self.project.getProjectName(),
             "no_attributes": self.noAttrs,
             "package": (
-                Utilities.fromNativeSeparators(self.__relPackage)
+                FileSystemUtilities.fromNativeSeparators(self.__relPackage)
                 if self.__relPackage
-                else Utilities.fromNativeSeparators(self.package)
+                else FileSystemUtilities.fromNativeSeparators(self.package)
             ),
         }
 
@@ -567,7 +572,7 @@
         try:
             self.noAttrs = data["no_attributes"]
 
-            package = Utilities.toNativeSeparators(data["package"])
+            package = FileSystemUtilities.toNativeSeparators(data["package"])
             if os.path.isabs(package):
                 self.package = package
                 self.__relPackage = ""