Mercurial Repositories > eric / file diff

--- a/eric6/Graphics/ImportsDiagramBuilder.py	Fri Apr 02 11:59:41 2021 +0200
+++ b/eric6/Graphics/ImportsDiagramBuilder.py	Sat May 01 14:27:20 2021 +0200
@@ -40,7 +40,7 @@
         @param showExternalImports flag indicating to show exports from
             outside the package (boolean)
         """
-        super(ImportsDiagramBuilder, self).__init__(dialog, view, project)
+        super().__init__(dialog, view, project)
         self.setObjectName("ImportsDiagram")
         
         self.showExternalImports = showExternalImports
@@ -61,12 +61,12 @@
             os.sep, '.')[1:]
         
         pname = self.project.getProjectName()
-        if pname:
-            name = self.tr("Imports Diagramm {0}: {1}").format(
+        name = (
+            self.tr("Imports Diagramm {0}: {1}").format(
                 pname, self.project.getRelativePath(self.packagePath))
-        else:
-            name = self.tr("Imports Diagramm: {0}").format(
-                self.packagePath)
+            if pname else
+            self.tr("Imports Diagramm: {0}").format(self.packagePath)
+        )
         self.umlView.setDiagramName(name)
     
     def __buildModulesDict(self):
@@ -94,13 +94,11 @@
             None, 0, tot, self.tr("%v/%m Modules"), self.parent())
         progress.setWindowTitle(self.tr("Imports Diagramm"))
         try:
-            prog = 0
             progress.show()
             QApplication.processEvents()
-            for module in modules:
+            for prog, module in enumerate(modules):
                 progress.setValue(prog)
                 QApplication.processEvents()
-                prog = prog + 1
                 try:
                     mod = Utilities.ModuleParser.readModule(
                         module, extensions=extensions, caching=False)
@@ -144,10 +142,8 @@
         for module in sortedkeys:
             impLst = []
             for i in modules[module].imports:
-                if i.startswith(self.package):
-                    n = i[len(self.package) + 1:]
-                else:
-                    n = i
+                n = (i[len(self.package) + 1:]
+                     if i.startswith(self.package) else i)
                 if i in modules:
                     impLst.append(n)
                 elif self.showExternalImports:
@@ -249,12 +245,12 @@
         
         @param shapes list of shapes
         """
-        from .AssociationItem import AssociationItem, Imports
+        from .AssociationItem import AssociationItem, AssociationType
         for module in list(shapes.keys()):
             for rel in shapes[module][1]:
                 assoc = AssociationItem(
                     shapes[module][0], shapes[rel][0],
-                    Imports,
+                    AssociationType.IMPORTS,
                     colors=self.umlView.getDrawingColors())
                 self.scene.addItem(assoc)