Changeset 3061

Timestamp:

11/27/05 12:23:22 (7 years ago)

Author:

moschny

Message:

• Reuse the TocFormatter object for formatting all toc entries - this might yield a performance enhancement (hard to measure).

File:

• trac/trunk/wiki-macros/TracNav.py (modified) (4 diffs)

trac/trunk/wiki-macros/TracNav.py

@@ -100 +100 @@
     last wiki link.
     """
-
-    def format_toc(self, wikitext, out):
+    def format_toc(self, wikitext):
+        self.link = None
+        out = StringIO()
         OneLinerFormatter.format(self, wikitext, out)
-        return self.link
+        return out.getvalue(), self.link
 
     def __init__(self, env):
@@ -118 +119 @@
     # FIXME: CamelCase links are special and not handled by the Formatter...
 
-def format_toc_entry(wikitext, env):
-    out = StringIO()
-    link = TocFormatter(env).format_toc(wikitext, out)
-    return out.getvalue(), link
-
 
 def get_toc_entry(toc_text, env):
@@ -128 +124 @@
     Parse and format the entries in toc_text.
     """
+    formatter = TocFormatter(env)
     for match in LISTRULE.finditer(toc_text):
         indent = len(match.group('indent'))
-        label, link = format_toc_entry(match.group('rest'), env)
+        label, link = formatter.format_toc(match.group('rest'))
         yield indent, link, label
 
@@ -176 +173 @@
     """
     gen = get_toc_entry_and_indent(get_toc_entry(toc_text, env))
-    toclist, _ = _parse_toc(gen, gen.next())
-    return toclist
+    toc, _ = _parse_toc(gen, gen.next())
+    return toc