From: Bernie Innocenti <bernie@codewiz.org>
Date: Tue, 24 Nov 2009 18:15:15 +0000 (-0500)
Subject: Merge branch 'master' of ssh://trinity.codewiz.org/~/public_html/wiki/git/geekigeeki
X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=commitdiff_plain;h=bfa2f63dc09c936f10b7cc3c1ee0c1c136af3591;hp=021fb390a791a3f990df0a4b9a51527cc47fb69b

Merge branch 'master' of ssh://trinity.codewiz.org/~/public_html/wiki/git/geekigeeki
---

diff --git a/geekigeeki.py b/geekigeeki.py
index aa54781..9d2bf9e 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -614,8 +614,8 @@ class WikiFormatter:
                     print('</p><p>')
                 else:
                     indent = indent_re.match(self.line)
-                    #3.0: print(self._indent_to(len(indent.group(0))), end=' ')
                     print(self._indent_to(len(indent.group(1)), indent.group(2)))
+                    # Stand back! Here we apply the monster regex that does all the parsing
                     print(re.sub(scan_re, self.replace, self.line))
 
         if self.in_pre: print('</pre>')
@@ -668,7 +668,7 @@ class Page:
         out = '== '
         pathname = ''
         for dirname in self.page_name.strip('/').split('/'):
-            pathname = (pathname + '/' + dirname) if pathname else dirname
+            pathname = (pathname and pathname + '/' ) + dirname
             out += '[[' + pathname + '|' + dirname + ']]/'
         out += ' ==\n'