Mercurial Repositories > eric / file diff

--- a/DocumentationTools/IndexGenerator.py	Sun Jul 25 17:08:39 2010 +0200
+++ b/DocumentationTools/IndexGenerator.py	Mon Jul 26 15:45:23 2010 +0200
@@ -50,15 +50,16 @@
                 TemplatesListsStyleCSS.indexListModulesTemplate
             self.indexListEntryTemplate = TemplatesListsStyleCSS.indexListEntryTemplate
         else:
-            self.headerTemplate = TemplatesListsStyle.headerTemplate % colors
-            self.footerTemplate = TemplatesListsStyle.footerTemplate % colors
-            self.indexBodyTemplate = TemplatesListsStyle.indexBodyTemplate % colors
+            self.headerTemplate = TemplatesListsStyle.headerTemplate.format(**colors)
+            self.footerTemplate = TemplatesListsStyle.footerTemplate.format(**colors)
+            self.indexBodyTemplate = \
+                TemplatesListsStyle.indexBodyTemplate.format(**colors)
             self.indexListPackagesTemplate = \
-                TemplatesListsStyle.indexListPackagesTemplate % colors
+                TemplatesListsStyle.indexListPackagesTemplate.format(**colors)
             self.indexListModulesTemplate = \
-                TemplatesListsStyle.indexListModulesTemplate % colors
+                TemplatesListsStyle.indexListModulesTemplate.format(**colors)
             self.indexListEntryTemplate = \
-                TemplatesListsStyle.indexListEntryTemplate % colors
+                TemplatesListsStyle.indexListEntryTemplate.format(**colors)
         
     def remember(self, file, moduleDocument, basename=""):
         """
@@ -119,7 +120,7 @@
             f = os.path.join(self.outputDir, "index")
             title = "Table of contents"
         else:
-            f = os.path.join(self.outputDir, "index-%s" % packagename)
+            f = os.path.join(self.outputDir, "index-{0}".format(packagename))
             title = packagename
         
         filename = joinext(f, ".html")
@@ -133,15 +134,15 @@
             names = sorted(list(subpacks.keys()))
             lst = []
             for name in names:
-                link = joinext("index-%s" % name, ".html")
-                lst.append(self.indexListEntryTemplate % {
+                link = joinext("index-{0}".format(name), ".html")
+                lst.append(self.indexListEntryTemplate.format(**{
                     "Description" : subpacks[name],
                     "Name" : name.split(".")[-1],
                     "Link" : link,
-                })
-            subpackages = self.indexListPackagesTemplate % {
+                }))
+            subpackages = self.indexListPackagesTemplate.format(**{
                 "Entries" : "".join(lst),
-            }
+            })
             
         # 2) modules
         if package["modules"]:
@@ -153,24 +154,24 @@
                 nam = name.split(".")[-1]
                 if nam == "__init__":
                     nam = name.split(".")[-2]
-                lst.append(self.indexListEntryTemplate % {
+                lst.append(self.indexListEntryTemplate.format(**{
                     "Description" : mods[name],
                     "Name" : nam,
                     "Link" : link,
-                })
-            modules = self.indexListModulesTemplate % {
+                }))
+            modules = self.indexListModulesTemplate.format(**{
                 "Entries" : "".join(lst),
-            }
+            })
             
-        doc = self.headerTemplate % { \
+        doc = self.headerTemplate.format(**{ \
                 "Title" : title,
-                "Style" : self.stylesheet} + \
-              self.indexBodyTemplate % { \
+                "Style" : self.stylesheet}) + \
+              self.indexBodyTemplate.format(**{ \
                 "Title" : title,
                 "Description" : package["description"],
                 "Subpackages" : subpackages,
                 "Modules" : modules,
-              } + \
+              }) + \
               self.footerTemplate
     
         f = open(filename, "w", encoding = "utf-8", newline = newline)
@@ -195,17 +196,17 @@
         if basename:
             basename = basename.replace(os.sep, ".")
             if not basename.endswith("."):
-                basename = "%s." % basename
+                basename = "{0}.".format(basename)
         for package, element in list(self.packages.items()):
             try:
                 if basename:
                     package = package.replace(basename,"")
                 out = self.__writeIndex(package, element, newline)
             except IOError as v:
-                sys.stderr.write("%s error: %s\n" % (package, v[1]))
+                sys.stderr.write("{0} error: {1}\n".format(package, v[1]))
             else:
                 if out:
-                    sys.stdout.write("%s ok\n" % out)
+                    sys.stdout.write("{0} ok\n".format(out))
     
         sys.stdout.write("Indices written.\n")
         sys.stdout.flush()