Mercurial Repositories > eric / file diff

--- a/src/eric7/Graphics/ImportsDiagramBuilder.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/Graphics/ImportsDiagramBuilder.py	Sun Dec 18 19:33:46 2022 +0100
@@ -13,8 +13,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
 
@@ -93,7 +94,11 @@
         modules = []
         for ext in Preferences.getPython("Python3Extensions"):
             modules.extend(
-                glob.glob(Utilities.normjoinpath(self.packagePath, "*{0}".format(ext)))
+                glob.glob(
+                    FileSystemUtilities.normjoinpath(
+                        self.packagePath, "*{0}".format(ext)
+                    )
+                )
             )
 
         tot = len(modules)
@@ -359,7 +364,7 @@
             return False
 
         self.packagePath = parts[0].split("=", 1)[1].strip()
-        self.showExternalImports = Utilities.toBool(parts[1].split("=", 1)[1].strip())
+        self.showExternalImports = Globals.toBool(parts[1].split("=", 1)[1].strip())
 
         self.initialize()
 
@@ -376,9 +381,9 @@
             "project_name": self.project.getProjectName(),
             "show_external": self.showExternalImports,
             "package": (
-                Utilities.fromNativeSeparators(self.__relPackagePath)
+                FileSystemUtilities.fromNativeSeparators(self.__relPackagePath)
                 if self.__relPackagePath
-                else Utilities.fromNativeSeparators(self.packagePath)
+                else FileSystemUtilities.fromNativeSeparators(self.packagePath)
             ),
         }
 
@@ -399,7 +404,7 @@
         try:
             self.showExternalImports = data["show_external"]
 
-            packagePath = Utilities.toNativeSeparators(data["package"])
+            packagePath = FileSystemUtilities.toNativeSeparators(data["package"])
             if os.path.isabs(packagePath):
                 self.packagePath = packagePath
                 self.__relPackagePath = ""