Mercurial Repositories > eric / file diff

--- a/src/eric7/DocumentationTools/ModuleDocumentor.py	Sun Dec 03 16:44:52 2023 +0100
+++ b/src/eric7/DocumentationTools/ModuleDocumentor.py	Sun Dec 03 19:46:34 2023 +0100
@@ -230,7 +230,7 @@
         attrNames = []
         scope = class_ if class_ is not None else self.module
         attrNames = sorted(
-            attr for attr in scope.globals.keys() if not scope.globals[attr].isSignal
+            attr for attr in scope.globals if not scope.globals[attr].isSignal
         )
         s = (
             "".join(
@@ -253,7 +253,7 @@
 
         @return The classes list section. (string)
         """
-        names = sorted(self.module.classes.keys())
+        names = sorted(self.module.classes)
         if names:
             self.empty = False
             s = self.__genListSection(names, self.module.classes)
@@ -268,7 +268,7 @@
 
         @return The modules list section. (string)
         """
-        names = sorted(self.module.modules.keys())
+        names = sorted(self.module.modules)
         if names:
             self.empty = False
             s = self.__genListSection(names, self.module.modules)
@@ -283,7 +283,7 @@
 
         @return The functions list section. (string)
         """
-        names = sorted(self.module.functions.keys())
+        names = sorted(self.module.functions)
         if names:
             self.empty = False
             s = self.__genListSection(names, self.module.functions)
@@ -298,7 +298,7 @@
 
         @return The classes details section. (string)
         """
-        classNames = sorted(self.module.classes.keys())
+        classNames = sorted(self.module.classes)
         classes = []
         for className in classNames:
             _class = self.module.classes[className]
@@ -421,7 +421,7 @@
         methList = []
         methBodies = []
         methods = sorted(
-            k for k in obj.methods.keys() if obj.methods[k].modifier == modifierFilter
+            k for k in obj.methods if obj.methods[k].modifier == modifierFilter
         )
         if "__init__" in methods:
             methods.remove("__init__")
@@ -501,7 +501,7 @@
 
         @return The Ruby modules details section. (string)
         """
-        rbModulesNames = sorted(self.module.modules.keys())
+        rbModulesNames = sorted(self.module.modules)
         rbModules = []
         for rbModuleName in rbModulesNames:
             rbModule = self.module.modules[rbModuleName]
@@ -551,7 +551,7 @@
         @return The classes list and classes details section.
             (tuple of two string)
         """
-        classNames = sorted(obj.classes.keys())
+        classNames = sorted(obj.classes)
         classes = []
         for className in classNames:
             _class = obj.classes[className]
@@ -641,7 +641,7 @@
         @return The functions details section. (string)
         """
         funcBodies = []
-        funcNames = sorted(self.module.functions.keys())
+        funcNames = sorted(self.module.functions)
         for funcName in funcNames:
             try:
                 funcBody = TemplatesListsStyleCSS.functionTemplate.format(
@@ -765,7 +765,7 @@
         @return The list section. (string)
         """
         lst = []
-        keys = sorted(dictionary.keys())
+        keys = sorted(dictionary)
         for key in keys:
             lst.append(
                 template.format(