Changeset 3058 for trac/trunk/wiki-macros/TracNav.py

Timestamp:

11/24/05 14:34:06 (7 years ago)

Author:

moschny

Message:

• Simplify get_toc_entry_and_indent().
• Update copyright notice.

File:

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

trac/trunk/wiki-macros/TracNav.py

@@ -45 +45 @@
 == Author and license ==
 
-Copyright 2005 Bernhard Haumacher (haui at haumacher.de)
+Copyright 2005
+ *  Bernhard Haumacher (haui at haumacher.de)
+ *  Thomas Moschny (moschny at ipd.uni-karlsruhe.de)
 
 {{{
@@ -141 +143 @@
     indentation of the first entry.
     """
-    try:
-        indent, link, label = gen.next()
-    except StopIteration:
-        indent = -1
-    yield indent
-
-    ready = False
-    while not ready:
-        yield link, label
+    while True:
         try:
             indent, link, label = gen.next()
         except StopIteration:
-            indent, ready = -1, True
+            yield -1
+            return
         yield indent
+        yield link, label