--- a/eric6/Graphics/ImportsDiagramBuilder.py Sat May 01 16:01:43 2021 +0200 +++ b/eric6/Graphics/ImportsDiagramBuilder.py Sat May 01 18:48:35 2021 +0200 @@ -135,39 +135,41 @@ sceneRect = self.umlView.sceneRect() modules = self.__buildModulesDict() - sortedkeys = sorted(modules.keys()) externalMods = [] packageList = self.shortPackage.split('.') packageListLen = len(packageList) - for module in sortedkeys: + for module in sorted(modules.keys()): impLst = [] - for i in modules[module].imports: - n = (i[len(self.package) + 1:] - if i.startswith(self.package) else i) - if i in modules: + for importName in modules[module].imports: + n = ( + importName[len(self.package) + 1:] + if importName.startswith(self.package) else + importName + ) + if importName in modules: impLst.append(n) elif self.showExternalImports: impLst.append(n) if n not in externalMods: externalMods.append(n) - for i in list(modules[module].from_imports.keys()): - if i.startswith('.'): - dots = len(i) - len(i.lstrip('.')) + for importName in list(modules[module].from_imports.keys()): + if importName.startswith('.'): + dots = len(importName) - len(importName.lstrip('.')) if dots == 1: - n = i[1:] - i = n + n = importName[1:] + importName = n else: if self.showExternalImports: n = '.'.join( packageList[:packageListLen - dots + 1] + - [i[dots:]]) + [importName[dots:]]) else: - n = i - elif i.startswith(self.package): - n = i[len(self.package) + 1:] + n = importName + elif importName.startswith(self.package): + n = importName[len(self.package) + 1:] else: - n = i - if i in modules: + n = importName + if importName in modules: impLst.append(n) elif self.showExternalImports: impLst.append(n)