From: Bernie Innocenti
Date: Tue, 24 Nov 2009 18:22:08 +0000 (-0500)
Subject: Merge commit 'giskard/master'
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=8e6f34588270b805d4151da2a66abf3f2f35c891;hp=-c;p=geekigeeki.git
Merge commit 'giskard/master'
---
8e6f34588270b805d4151da2a66abf3f2f35c891
diff --combined geekigeeki.py
index 83a8e8f,44b5131..317e9ca
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@@ -120,7 -120,7 +120,7 @@@ def send_guru(msg_text, msg_type)
print(cgi.escape(msg_text))
if msg_type == 'error':
print '\n Guru Meditation #DEADBEEF.ABADC0DE'
- print('' \
+ print('' \
% relative_url('sys/GuruMeditation.js'))
def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False, mtime=None):
@@@ -610,8 -610,8 +610,8 @@@ class WikiFormatter
print('
')
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('')
@@@ -664,7 -664,7 +664,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'