Mercurial Repositories > eric / file diff

--- a/eric7/DocumentationTools/IndexGenerator.py	Mon Sep 13 18:00:33 2021 +0200
+++ b/eric7/DocumentationTools/IndexGenerator.py	Mon Sep 13 18:27:17 2021 +0200
@@ -37,18 +37,7 @@
             }
         }
         self.remembered = False
-        
-        # TODO: replace these assignments
-        self.headerTemplate = TemplatesListsStyleCSS.headerTemplate
-        self.footerTemplate = TemplatesListsStyleCSS.footerTemplate
-        self.indexBodyTemplate = TemplatesListsStyleCSS.indexBodyTemplate
-        self.indexListPackagesTemplate = (
-            TemplatesListsStyleCSS.indexListPackagesTemplate)
-        self.indexListModulesTemplate = (
-            TemplatesListsStyleCSS.indexListModulesTemplate)
-        self.indexListEntryTemplate = (
-            TemplatesListsStyleCSS.indexListEntryTemplate)
-        
+    
     def remember(self, file, moduleDocument, basename=""):
         """
         Public method to remember a documentation file.
@@ -123,14 +112,18 @@
             lst = []
             for name in names:
                 link = joinext("index-{0}".format(name), ".html")
-                lst.append(self.indexListEntryTemplate.format(**{
-                    "Description": subpacks[name],
-                    "Name": name.split(".")[-1],
-                    "Link": link,
-                }))
-            subpackages = self.indexListPackagesTemplate.format(**{
-                "Entries": "".join(lst),
-            })
+                lst.append(
+                    TemplatesListsStyleCSS.indexListEntryTemplate.format(**{
+                        "Description": subpacks[name],
+                        "Name": name.split(".")[-1],
+                        "Link": link,
+                    })
+                )
+            subpackages = (
+                TemplatesListsStyleCSS.indexListPackagesTemplate.format(**{
+                    "Entries": "".join(lst),
+                })
+            )
             
         # 2) modules
         if package["modules"]:
@@ -142,24 +135,28 @@
                 nam = name.split(".")[-1]
                 if nam == "__init__":
                     nam = name.split(".")[-2]
-                lst.append(self.indexListEntryTemplate.format(**{
-                    "Description": mods[name],
-                    "Name": nam,
-                    "Link": link,
-                }))
-            modules = self.indexListModulesTemplate.format(**{
-                "Entries": "".join(lst),
-            })
+                lst.append(
+                    TemplatesListsStyleCSS.indexListEntryTemplate.format(**{
+                        "Description": mods[name],
+                        "Name": nam,
+                        "Link": link,
+                    })
+                )
+            modules = (
+                TemplatesListsStyleCSS.indexListModulesTemplate.format(**{
+                    "Entries": "".join(lst),
+                })
+            )
             
         doc = (
-            self.headerTemplate.format(
+            TemplatesListsStyleCSS.headerTemplate.format(
                 **{"Title": title}
-            ) + self.indexBodyTemplate.format(
+            ) + TemplatesListsStyleCSS.indexBodyTemplate.format(
                 **{"Title": title,
                    "Description": package["description"],
                    "Subpackages": subpackages,
                    "Modules": modules}
-            ) + self.footerTemplate
+            ) + TemplatesListsStyleCSS.footerTemplate
         )
     
         with open(filename, "w", encoding="utf-8", newline=newline) as f: