X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=blobdiff_plain;f=geekigeeki.py;h=71920f370b9dd74f6c0df8b057bf308a404fa9f0;hp=8de46ab91cbf4d2b14e4ce25753a0848545c311c;hb=093f6c0344c19dcdf8d3bb7e437dd9c45a5982f9;hpb=fbc4d6639e75dd726fdcadc1129ae0900468e9d2 diff --git a/geekigeeki.py b/geekigeeki.py index 8de46ab..71920f3 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -3,7 +3,7 @@ # # Copyright 1999, 2000 Martin Pool # Copyright 2002 Gerardo Poggiali -# Copyright 2007, 2008 Bernie Innocenti +# Copyright 2007, 2008, 2009 Bernie Innocenti # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,97 +18,106 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -__version__ = '$Id$'[4:12] +__version__ = '4.0-' + '$Id$'[4:11] from time import clock start_time = clock() +title_done = False import cgi, sys, os, re, errno, stat -from os import path, environ -# Regular expression defining a WikiWord -# (but this definition is also assumed in other places) -word_re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$") +image_ext = 'png|gif|jpg|jpeg|bmp|ico' +video_ext = "ogg|ogv|oga" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt +image_re = re.compile(r".*\.(" + image_ext + "|" + video_ext + ")", re.IGNORECASE) +video_re = re.compile(r".*\.(" + video_ext + ")", re.IGNORECASE) # FIXME: we accept stuff like foo/../bar and we shouldn't -file_re = re.compile(r"^\b([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)\b$") -img_re = re.compile(r"^.*\.(png|gif|jpg|jpeg|bmp|ico)$", re.IGNORECASE) -url_re = re.compile(r"^[a-z]{3,8}://[^\s'\"]+\S$") -link_re = re.compile("(?:\[\[|{{)([^\s\|]+)(?:\s*\|\s*([^\]]+)|)(?:\]\]|}})") - -title_done = False - +file_re = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)") +url_re = re.compile(r"[a-z]{3,8}://[^\s'\"]+\S") +ext_re = re.compile(r"\.([^\./]+)$") # CGI stuff --------------------------------------------------------- - def script_name(): - return environ.get('SCRIPT_NAME', '') + return os.environ.get('SCRIPT_NAME', '') + +def query_string(): + path_info = os.environ.get('PATH_INFO', '') + if len(path_info) and path_info[0] == '/': + return path_info[1:] or 'FrontPage' + else: + return os.environ.get('QUERY_STRING', '') or 'FrontPage' def privileged_path(): return privileged_url or script_name() def remote_user(): - user = environ.get('REMOTE_USER', '') + user = os.environ.get('REMOTE_USER', '') if user is None or user == '' or user == 'anonymous': user = 'AnonymousCoward' return user def remote_host(): - return environ.get('REMOTE_ADDR', '') + return os.environ.get('REMOTE_ADDR', '') def get_hostname(addr): try: from socket import gethostbyaddr return gethostbyaddr(addr)[0] + ' (' + addr + ')' - except Exception, er: + except Exception: return addr +def is_external_url(pathname): + return (url_re.match(pathname) or pathname.startswith('/')) + def relative_url(pathname, privileged=False): - if not (url_re.match(pathname) or pathname.startswith('/')): + if not is_external_url(pathname): if privileged: url = privileged_path() else: url = script_name() pathname = url + '/' + pathname - return pathname + return cgi.escape(pathname, quote=True) def permalink(s): return re.sub(' ', '-', re.sub('[^a-z0-9_ ]', '', s.lower()).strip()) +def humanlink(s): + return re.sub(r'(?:.*[/:]|)([^:/\.]+)(?:\.[^/:]+|)$', r'\1', s.replace('_', ' ')) + +# Split arg lists like "blah| blah blah| width=100 | align = center", +# return a list containing anonymous arguments and a map containing the named arguments +def parse_args(s): + args = [] + kwargs = {} + for arg in s.strip('<[{}]>').split('|'): + m = re.match('\s*(\w+)\s*=\s*(.+)\s*', arg) + if m is not None: + kwargs[m.group(1)] = m.group(2) + else: + args.append(arg.strip()) + return (args, kwargs) + +def url_args(kvargs): + argv = [] + for k, v in kvargs.items(): + argv.append(k + '=' + v) + if argv: + return '?' + '&'.join(argv) + return '' + # Formatting stuff -------------------------------------------------- def emit_header(mime_type="text/html"): - print "Content-type: " + mime_type + "; charset=utf-8\n" + print("Content-type: " + mime_type + "; charset=utf-8\n") def send_guru(msg_text, msg_type): if not msg_text: return - print '
'
+    print('
')
     if msg_type == 'error':
-        print '    Software Failure.  Press left mouse button to continue.\n'
-    print msg_text
+        print('    Software Failure.  Press left mouse button to continue.\n')
+    print(msg_text)
     if msg_type == 'error':
-        print '      Guru Meditation #DEADBEEF.ABADC0DE'
-    print '
'
-    # FIXME: This little JS snippet is harder to pass than ACID 3.0 
-    print """
-    """
+        print '\n           Guru Meditation #DEADBEEF.ABADC0DE'
+    print('
' \ + % relative_url('sys/GuruMeditation.js')) def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False): global title_done @@ -116,86 +125,121 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal # Head emit_header() - print '' - print '' + print('') + print('') - site_name = globals().get('site_name', 'Unconfigured Site') - print "%s: %s" % (site_name, text) - print ' ' + print("%s: %s" % (site_name, text)) + print(' ') if not name: - print ' ' + print(' ') + + for meta in meta_urls: + http_equiv, content = meta + print(' ' % (http_equiv, relative_url(content))) for link in link_urls: rel, href = link - print ' ' % (rel, relative_url(href)) + print(' ' % (rel, relative_url(href))) if name and writable and privileged_url is not None: - print ' ' \ - % (privileged_path() + '?edit=' + name) + print(' ' \ + % (privileged_path() + '?a=edit&q=' + name)) if history_url is not None: - print ' ' \ - % relative_url(history_url + '?a=rss') + print(' ' \ + % relative_url(history_url + '?a=rss')) - print '' + print('') # Body if name and writable and privileged_url is not None: - print '' + print('') else: - print '' + print('') title_done = True send_guru(msg_text, msg_type) # Navbar - print '
' + print('
') + print link_tag('FrontPage', site_icon or 'Home', cssclass='navlink') if name: - print ' ' + link_tag('?fullsearch=' + name, text, 'navlink') + ' ' + print(' ' + link_tag('?fullsearch=' + name, text, cssclass='navlink') + ' ') else: - print ' ' + text + ' ' - print ' | ' + link_tag('FrontPage', 'Home', 'navlink') - print ' | ' + link_tag('FindPage', 'Find Page', 'navlink') + print(' ' + text + ' ') + print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink')) if 'history_url' in globals(): - print ' | Recent Changes' + print(' | Recent Changes') if name: - print ' | Page History' + print(' | Page History') if name: - print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink') + print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink')) if privileged_url is not None: if writable: - print ' | ' + link_tag('?edit=' + name, 'Edit', 'navlink', privileged=True) + print(' | ' + link_tag('?a=edit&q=' + name, 'Edit', cssclass='navlink', privileged=True)) else: - print ' | ' + link_tag(name, 'Login', 'navlink', privileged=True) + print(' | ' + link_tag(name, 'Login', cssclass='navlink', privileged=True)) else: - print ' | Immutable Page' + print(' | Immutable Page') user = remote_user() if user != 'AnonymousCoward': - print ' | ' + print(' | ') + + print('
') - print '
' +def send_httperror(status="403 Not Found", query=""): + print("Status: %s" % status) + send_title(None, msg_text=("%s: on query '%s'" % (status, query))) + send_footer() -def link_tag(params, text=None, ss_class=None, privileged=False): +def link_tag(dest, text=None, privileged=False, **kvargs): if text is None: - text = params # default - classattr = '' - if ss_class: - classattr += 'class="%s" ' % ss_class - # Prevent crawlers from following links potentially added by spammers or to generated pages - if ss_class == 'external' or ss_class == 'navlink': - classattr += 'rel="nofollow" ' - elif url_re.match(params): - classattr += 'rel="nofollow" ' - return '%s' % (classattr, relative_url(params, privileged=privileged), text) + text = humanlink(dest) + elif image_re.match(text): + text = '' + text + '' + + link_class = kvargs.get('class', kvargs.get('cssclass', None)) + if not link_class: + if is_external_url(dest): + link_class = 'external' + elif file_re.match(dest) and Page(dest).exists(): + link_class = 'wikilink' + else: + text = nonexist_pfx + text + link_class = 'nonexistent' + + # Prevent crawlers from following links potentially added by spammers or to generated pages + nofollow = '' + if link_class == 'external' or link_class == 'navlink': + nofollow = 'rel="nofollow" ' + + return '%s' % (link_class, nofollow, relative_url(dest, privileged=privileged), text) + +def link_inline(name, descr=None, kvargs={}): + if not descr: descr = humanlink(name) + url = relative_url(name) + if video_re.match(name): + return '' % url + elif image_re.match(name): + return '%s' % (url, url + url_args(kvargs), descr) + elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page + return Page(name).send_naked() + else: + return '' \ + % (url, url, name) # Search --------------------------------------------------- -def handle_fullsearch(needle): - send_title(None, 'Full text search for "%s"' % (needle)) +def print_search_stats(hits, searched): + print("

%d hits out of %d pages searched.

" % (hits, searched)) + +def handle_fullsearch(query, form): + needle = form['q'].value + send_title(None, 'Full text search for "' + needle + '"') needle_re = re.compile(needle, re.IGNORECASE) hits = [] @@ -211,44 +255,49 @@ def handle_fullsearch(needle): hits.sort() hits.reverse() - print "
    " + print("
      ") for (count, page_name) in hits: - print '

    • ' + Page(page_name).link_to() - print ' . . . . ' + `count` - print ['match', 'matches'][count != 1] - print '

      • ' - print "
    " + print('

  • ' + link_tag(page_name)) + print(' . . . . ' + `count`) + print(['match', 'matches'][count != 1]) + print('

    • ') + print("
") print_search_stats(len(hits), len(all_pages)) -def handle_titlesearch(needle): - # TODO: check needle is legal -- but probably we can just accept any RE - send_title(None, "Title search for \"" + needle + '"') +def handle_titlesearch(query, form): + needle = form['q'].value + send_title(None, 'Title search for "' + needle + '"') needle_re = re.compile(needle, re.IGNORECASE) all_pages = page_list() - hits = filter(needle_re.search, all_pages) + hits = list(filter(needle_re.search, all_pages)) - print "
    " + print("
      ") for filename in hits: - print '

    • ' + Page(filename).link_to() + "

      • " - print "
    " + print('

  • ' + link_tag(filename) + "

    • ") + print("
") print_search_stats(len(hits), len(all_pages)) -def print_search_stats(hits, searched): - print "

%d hits out of %d pages searched.

" % (hits, searched) +def handle_raw(pagename, form): + if not file_re.match(pagename): + send_httperror("403 Forbidden", pagename) + return -def handle_raw(pagename): Page(pagename).send_raw() -def handle_edit(pagename): - pg = Page(pagename) +def handle_edit(pagename, form): + if not file_re.match(pagename): + send_httperror("403 Forbidden", pagename) + return + + pg = Page(form['q'].value) if 'save' in form: if form['file'].value: - pg.save(form['file'].file.read()) + pg.save(form['file'].file.read(), form['changelog'].value) else: - pg.save(form['savetext'].value.replace('\r\n', '\n')) + pg.save(form['savetext'].value.replace('\r\n', '\n'), form['changelog'].value) pg.format() elif 'cancel' in form: pg.msg_text = 'Editing canceled' @@ -260,25 +309,44 @@ def handle_edit(pagename): text = form['savetext'].value pg.send_editor(text) +def handle_get(pagename, form): + if file_re.match(pagename): + # FIMXE: this is all bullshit, MimeTypes bases its guess on the extension! + from mimetypes import MimeTypes + mimetype, encoding = MimeTypes().guess_type(pagename) + if mimetype: + Page(pagename).send_raw(mimetype=mimetype, args=form) + else: + Page(pagename).format() + else: + send_httperror("403 Forbidden", pagename) + +# Used by macros/WordIndex and macros/TitleIndex def make_index_key(): - links = map(lambda ch: '%s' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz') - return '

'+ ' | '.join(links) + '

' + links = ['%s' % (ch, ch) for ch in 'abcdefghijklmnopqrstuvwxyz'] + return '

' + ' | '.join(links) + '

' -def page_list(dir = None, re = word_re): - return filter(re.match, os.listdir(dir or data_dir)) +def page_list(dirname=None, re=None): + if re is None: + # FIXME: WikiWord is too restrictive now! + re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$") + return sorted(filter(re.match, os.listdir(dirname or data_dir))) -def send_footer(name, mod_string=None): +def send_footer(mod_string=None): if globals().get('debug_cgi', False): cgi.print_arguments() cgi.print_form(form) cgi.print_environ() - print '') class WikiFormatter: """Object that turns Wiki markup into HTML. @@ -296,14 +364,14 @@ class WikiFormatter: self.styles = { #wiki html enabled? "//": ["em", False], - "''": ["em", False], "**": ["b", False], - "'''": ["b", False], "##": ["tt", False], - "``": ["tt", False], "__": ["u", False], "^^": ["sup", False], - ",,": ["sub", False] + ",,": ["sub", False], + "''": ["em", False], # LEGACY + "'''": ["b", False], # LEGACY + "``": ["tt", False], # LEGACY } def _b_repl(self, word): @@ -327,82 +395,69 @@ class WikiFormatter: def _rule_repl(self, word): return self._undent() + '\n
\n' % (len(word) - 2) - def _word_repl(self, word): - return Page(word).link_to() - - def _img_repl(self, word): - path = relative_url(word) - return '' % (path, path) - - def _url_repl(self, word): - if img_re.match(word): - return '' % (word, word) - else: - return '%s' % (word, word) - def _macro_repl(self, word): - m = re.compile("\<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>").match(word) - name = m.group(1) - argv = [name] - if m.group(2): - argv.extend(m.group(2).split('|')) - argv = map(str.strip, argv) - - macro = globals().get('_macro_' + name) - if not macro: - execfile("macros/" + name + ".py", globals()) - macro = globals().get('_macro_' + name) - if macro: - return macro(argv) - else: - return '<<' + '|'.join(argv) + '>>' + try: + args, kwargs = parse_args(word) + macro = globals().get('_macro_' + args[0]) + if not macro: + exec(open("macros/" + name + ".py").read(), globals()) + macro = globals().get('_macro_' + name) + return macro(*args, **kwargs) + except Exception: + msg = cgi.escape(word) + if not self.in_html: + msg = '' + msg + '' + return msg def _hurl_repl(self, word): - m = link_re.match(word) - name = m.group(1) - descr = m.group(2) - if descr is None: - descr = name - elif img_re.match(m.group(2)): - descr = '' - - return link_tag(name, descr, 'wikilink') + args, kvargs = parse_args(word) + return link_tag(*args, **kvargs) def _inl_repl(self, word): - m = link_re.match(word) - name = m.group(1) - descr = m.group(2) or name - name = relative_url(name) - argv = descr.split('|') - descr = argv.pop(0) - - if argv: - args = '?' + '&'.join(argv) - else: - args = '' - - if descr: - # The "extthumb" nonsense works around a limitation of the HTML block model - return '
%s
%s
' \ - % (name, name + args, descr, descr) + args, kvargs = parse_args(word) + name = args.pop(0) + if len(args): + descr = args.pop(0) + # This double div nonsense works around a limitation of the HTML block model + return '
' \ + + '
' \ + + link_inline(name, descr, kvargs) \ + + '
' + descr + '
' else: - return '' % (name, name + args) - - def _email_repl(self, word): - return '%s' % (word, word) + return link_inline(name, None, kvargs) def _html_repl(self, word): + if not self.in_html and word.startswith('': - self.in_html -= 1 - return '>' + if self.in_html: + return s; # Pass through return {'&': '&', '<': '<', '>': '>'}[s] + def _img_repl(self, word): # LEGACY + return self._inl_repl('{{' + word + '}}') + + def _word_repl(self, word): # LEGACY + if self.in_html: return word # pass through + return link_tag(word) + + def _url_repl(self, word): # LEGACY + if self.in_html: return word # pass through + return link_tag(word) + + def _email_repl(self, word): # LEGACY + if self.in_html: return word # pass through + return '%s' % (word, word) + def _li_repl(self, match): if self.in_li: return '
  • ' @@ -469,85 +524,86 @@ class WikiFormatter: return res def replace(self, match): - for type, hit in match.groupdict().items(): + for rule, hit in list(match.groupdict().items()): if hit: - return getattr(self, '_' + type + '_repl')(hit) + return getattr(self, '_' + rule + '_repl')(hit) else: - raise "Can't handle match " + `match` + raise "Can't handle match " + repr(match) def print_html(self): - print '

    ' - - # For each line, we scan through looking for magic - # strings, outputting verbatim any intervening text - # TODO: highlight search words (look at referrer) - scan_re = re.compile( - r"(?:" - # Formatting - + r"(?P\*\*|'''|//|''|##|``|__|\^\^|,,)" - + r"|(?P\={2,6})" - + r"|(?P
    \\\\)" - + r"|(?P^-{3,})" - + r"|(?P\b(FIXME|TODO|DONE)\b)" + print('

    ') + + scan_re = re.compile(r"""(?: + # Styles and formatting + (?P \*\*|'''|//|''|\#\#|``|__|\^\^|,,) + | (?P \={2,6}) + | (?P
    \\\\) + | (?P ^-{3,}) + | (?P \b( FIXME | TODO | DONE )\b ) # Links - + r"|(?P\<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>)" - + r"|(?P\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])" + | (?P \<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>) + | (?P \[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\]) # Inline HTML - + r"|(?P<(/|)(br|hr|div|form|iframe|input|span))" - + r"|(?P[<>&])" + | (?P <(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])\b ) + | (?P ( /\s*> | ) ) + | (?P [<>&] ) # Auto links (LEGACY) - + r"|(?P\b[a-zA-Z0-9_/-]+\.(png|gif|jpg|jpeg|bmp|ico))" - + r"|(?P\b(?:[A-Z][a-z]+){2,}\b)" - + r"|(?P(http|https|ftp|mailto)\:[^\s'\"]+\S)" - + r"|(?P[-\w._+]+\@[\w.-]+)" + | (?P \b[a-zA-Z0-9_/-]+\.(""" + image_ext + "|" + video_ext + r""")) + | (?P \b(?:[A-Z][a-z]+){2,}\b) + | (?P (http|https|ftp|mailto)\:[^\s'\"]+\S) + | (?P [-\w._+]+\@[\w.-]+) # Lists, divs, spans - + r"|(?P

  • ^\s+[\*#] +)" - + r"|(?P
    \{\{\{|\s*\}\}\})"
-            + r"|(?P\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})"
+            | (?P
  •     ^\s+[\*\#]\s+)
+            | (?P
       \{\{\{|\s*\}\}\})
+            | (?P   \{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})
 
             # Tables
-            + r"|(?P^\s*\|\|(=|)\s*)"
-            + r"|(?P\s*\|\|(=|)\s*$)"
-            + r"|(?P\s*\|\|(=|)\s*)"
-            + r")")
-        pre_re = re.compile(
-            r"(?:"
-            + r"(?P
    \s*\}\}\})"
-            + r"|(?P[<>&])"
-            + r")")
+            | (?P    ^\s*\|\|(=|)\s*)
+            | (?P   \s*\|\|(=|)\s*$)
+            | (?P    \s*\|\|(=|)\s*)
+
+            # TODO: highlight search words (look at referrer)
+          )""", re.VERBOSE)
+        pre_re = re.compile("""(?:
+              (?P
    \s*\}\}\})
+            | (?P[<>&])"
+            )""", re.VERBOSE)
         blank_re = re.compile(r"^\s*$")
         indent_re = re.compile(r"^\s*")
         tr_re = re.compile(r"^\s*\|\|")
         eol_re = re.compile(r"\r?\n")
-        for self.line in eol_re.split(self.raw.expandtabs()):
-            # Skip ACLs
+        # For each line, we scan through looking for magic strings, outputting verbatim any intervening text
+        #3.0: for self.line in eol_re.split(str(self.raw.expandtabs(), 'utf-8')):
+        for self.line in eol_re.split(str(self.raw.expandtabs())):
+            # Skip pragmas
             if self.in_header:
                 if self.line.startswith('#'):
                     continue
                 self.in_header = False
 
             if self.in_pre:
-                print re.sub(pre_re, self.replace, self.line)
+                print(re.sub(pre_re, self.replace, self.line))
             else:
                 if self.in_table and not tr_re.match(self.line):
                     self.in_table = False
-                    print '
    '
+                    print('
    ')
 
                 if blank_re.match(self.line):
-                    print '
    '
+                    print('
    ')
                 else:
                     indent = indent_re.match(self.line)
-                    print self._indent_to(len(indent.group(0)))
-                    print re.sub(scan_re, self.replace, self.line)
+                    #3.0: print(self._indent_to(len(indent.group(0))), end=' ')
+                    print(self._indent_to(len(indent.group(0))))
+                    print(re.sub(scan_re, self.replace, self.line))
 
-        if self.in_pre: print '
    '
-        if self.in_table: print '
    '
-        print self._undent()
-        print '
    '
+        if self.in_pre: print('
    ')
+        if self.in_table: print('
    ')
+        print(self._undent())
+        print('
    ')
 
 class Page:
     def __init__(self, page_name):
@@ -560,85 +616,80 @@ class Page:
         return re.sub('([a-z])([A-Z])', r'\1 \2', self.page_name)
 
     def _filename(self):
-        return path.join(data_dir, self.page_name)
+        return os.path.join(data_dir, self.page_name)
 
     def _tmp_filename(self):
-        return path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#'))
+        return os.path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + str(os.getpid()) + '#'))
 
     def exists(self):
         try:
             os.stat(self._filename())
             return True
-        except OSError, er:
-            if er.errno == errno.ENOENT:
+        except OSError, err:
+            if err.errno == errno.ENOENT:
                 return False
-            raise er
-
-    def link_to(self):
-        word = self.page_name
-        if self.exists():
-            return link_tag(word, word, 'wikilink')
-        else:
-            return link_tag(word, nonexist_pfx + word, 'nonexistent')
+            raise err
 
-    def get_raw_body(self):
+    def get_raw_body(self, default=None):
         try:
             return open(self._filename(), 'rb').read()
-        except IOError, er:
-            if er.errno == errno.ENOENT:
-                return '' # just doesn't exist, use default
-            if er.errno == errno.EISDIR:
+        except IOError, err:
+            if err.errno == errno.ENOENT:
+                if default is None:
+                    default = '//[[?a=edit&q=%s|Describe %s]]//' % (self.page_name, self.page_name)
+                return default
+            if err.errno == errno.EISDIR:
                 return self.format_dir()
-            raise er
+            raise err
 
     def format_dir(self):
         out = '== '
-        path = ''
-        for dir in self.page_name.split('/'):
-            path = (path + '/' + dir) if path else dir
-            out += '[[' + path + '|' + dir + ']]/'
+        pathname = ''
+        for dirname in self.page_name.split('/'):
+            pathname = (pathname + '/' + dirname) if pathname else dirname
+            out += '[[' + pathname + '|' + dirname + ']]/'
         out += ' ==\n'
  
-        for file in page_list(self._filename(), file_re):
-            if img_re.match(file):
+        for filename in page_list(self._filename(), file_re):
+            if image_re.match(filename):
                 if image_maxwidth:
-                    maxwidth_arg = '|maxwidth=' + str(image_maxwidth)
-                out += '{{' + self.page_name + '/' + file + '|' + file + maxwidth_arg + '}}\n'
+                    maxwidth_arg = ' | maxwidth=' + str(image_maxwidth)
+                out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth_arg + ' | class=thumbleft}}\n'
             else:
-                out += ' * [[' + self.page_name + '/' + file + ']]\n'
+                out += ' * [[' + self.page_name + '/' + filename + ']]\n'
         return out
-    def get_attrs(self):
-        if 'attrs' in self.__dict__:
-            return self.attrs
-        self.attrs = {}
-        try:
-            file = open(self._filename(), 'rt')
-            attr_re = re.compile(r"^#(\S*)(.*)$")
-            for line in file:
-                m = attr_re.match(line)
-                if not m:
-                    break
-                self.attrs[m.group(1)] = m.group(2).strip()
-                #print "bernie: attrs[" + m.group(1) + "] = " + m.group(2) + "
    \n"
-        except IOError, er:
-            if er.errno != errno.ENOENT and er.errno != errno.EISDIR:
-                raise er
-        return self.attrs
-
-    def get_attr(self, name, default):
-        return self.get_attrs().get(name, default)
+
+    def pragmas(self):
+        if not '_pragmas' in self.__dict__:
+            self._pragmas = {}
+            try:
+                file = open(self._filename(), 'rt')
+                attr_re = re.compile(r"^#(\S*)(.*)$")
+                for line in file:
+                    m = attr_re.match(line)
+                    if not m:
+                        break
+                    self._pragmas[m.group(1)] = m.group(2).strip()
+                    #print "bernie: pragmas[" + m.group(1) + "] = " + m.group(2) + "
    \n"
+            except IOError, err:
+                if err.errno != errno.ENOENT and err.errno != errno.EISDIR:
+                    raise er
+        return self._pragmas
+
+    def pragma(self, name, default):
+        return self.pragmas().get(name, default)
 
     def can(self, action, default=True):
         acl = None
         try:
             #acl SomeUser:read,write All:read
-            acl = self.get_attr("acl", None)
+            acl = self.pragma("acl", None)
             for rule in acl.split():
                 (user, perms) = rule.split(':')
                 if user == remote_user() or user == "All":
                     return action in perms.split(',')
             return False
-        except Exception, er:
+        except Exception:
             if acl:
                 self.msg_text = 'Illegal acl line: ' + acl
         return default
@@ -657,23 +708,23 @@ class Page:
 
     def format(self):
         #css foo.css
-        value = self.get_attr("css", None)
+        value = self.pragma("css", None)
         if value:
             global link_urls
-            link_urls += { "stylesheet": value }
+            link_urls += [ [ "stylesheet", value ] ]
 
         send_title(self.page_name, self.split_title(),
             msg_text=self.msg_text, msg_type=self.msg_type, writable=self.can_write())
         self.send_naked()
-        send_footer(self.page_name, self._last_modified())
+        send_footer(self._last_modified())
 
     def _last_modified(self):
         try:
             from time import localtime, strftime
             modtime = localtime(os.stat(self._filename())[stat.ST_MTIME])
-        except OSError, er:
-            if er.errno != errno.ENOENT:
-                raise er
+        except OSError, err:
+            if err.errno != errno.ENOENT:
+                raise err
             return None
         return strftime(datetime_fmt, modtime)
 
@@ -683,42 +734,46 @@ class Page:
             send_guru("Write access denied by ACLs", "error")
             return
 
-        file = ''
+        filename = ''
         if 'file' in form:
-            file = form['file'].value
+            filename = form['file'].value
 
-        print ('
    Editing ' + self.page_name
+        print(('
    Editing ' + self.page_name
             + ' for ' + cgi.escape(remote_user())
             + ' from ' + cgi.escape(get_hostname(remote_host()))
-            + '
    ')
-        print '
    ' % relative_url(self.page_name)
-        print '' % (self.page_name)
-        print '' % (preview or self.get_raw_body())
-        print 'Or upload a file: ' % file
-        print """
+            + '
    '))
+        print('
    ' % relative_url(self.page_name))
+        print('')
+        print('
    ' % (self.page_name))
+        print('' \
+            % cgi.escape(preview or self.get_raw_body(default='')))
+        print(' ' % filename)
+        print("""
             
    
-            
-            
+            
+            
             
             
             
    
-            
    """
-        print "
    " + Page('EditingTips').link_to() + "
    "
+            
    
+            
+            """)
+        print("
    " + link_tag('EditingTips') + "
    ")
         if preview:
-            print "
    "
+            print("
    ")
             WikiFormatter(preview).print_html()
-            print "
    "
-        send_footer(self.page_name)
+            print("
    ")
+        send_footer()
 
-    def send_raw(self, mimetype='text/plain'):
-        if self.can_read():
-            body = self.get_raw_body()
-            emit_header(mimetype)
-            print body
-        else:
+    def send_raw(self, mimetype='text/plain', args=[]):
+        if not self.can_read():
             send_title(None, msg_text='Read access denied by ACLs', msg_type='notice')
+            return
 
-    def send_image(self, mimetype, args=[]):
         if 'maxwidth' in args:
             import subprocess
             emit_header(mimetype)
@@ -726,7 +781,9 @@ class Page:
             subprocess.check_call(['gm', 'convert', self._filename(),
                 '-scale', args['maxwidth'].value + ' >', '-'])
         else:
-            self.send_raw(mimetype)
+            body = self.get_raw_body()
+            emit_header(mimetype)
+            print(body)
 
     def _write_file(self, data):
         tmp_filename = self._tmp_filename()
@@ -736,11 +793,11 @@ class Page:
             # Bad Bill!  POSIX rename ought to replace. :-(
             try:
                 os.remove(name)
-            except OSError, er:
-                if er.errno != errno.ENOENT: raise er
+            except OSError, err:
+                if err.errno != errno.ENOENT: raise err
         os.rename(tmp_filename, name)
 
-    def save(self, newdata):
+    def save(self, newdata, changelog):
         if not self.can_write():
             self.msg_text = 'Write access denied by ACLs'
             self.msg_type = 'error'
@@ -749,60 +806,29 @@ class Page:
         self._write_file(newdata)
         rc = 0
         if post_edit_hook:
-            # FIXME: what's the std way to perform shell quoting in python?
-            cmd = ( post_edit_hook
-                + " '" + data_dir + '/' + self.page_name
-                + "' '" + remote_user()
-                + "' '" + remote_host() + "'"
-            )
-            out = os.popen(cmd)
-            output = out.read()
-            rc = out.close()
+            import subprocess
+            cmd = [ post_edit_hook, data_dir + '/' + self.page_name, remote_user(), remote_host(), changelog]
+            child = subprocess.Popen(cmd, stdout=subprocess.PIPE, close_fds=True)
+            output = child.stdout.read()
+            rc = child.wait()
         if rc:
-            self.msg_text += "Post-editing hook returned %d.\n" % rc
-            self.msg_text += 'Command was: ' + cmd + '\n'
+            self.msg_text += "Post-editing hook returned %d. Command was:\n'%s'\n" % (rc, "' '".join(cmd))
             if output:
                 self.msg_text += 'Output follows:\n' + output
         else:
             self.msg_text = 'Thank you for your contribution.  Your attention to detail is appreciated.'
             self.msg_type = 'success'
 
-# Main ---------------------------------------------------------------
 try:
-    execfile("geekigeeki.conf.py")
+    exec(open("geekigeeki.conf.py").read())
     form = cgi.FieldStorage()
-
-    for cmd in form:
-        handler = globals().get('handle_' + cmd)
-        if handler:
-            handler(form[cmd].value)
-            break
+    action = form.getvalue('a', 'get')
+    handler = globals().get('handle_' + action)
+    if handler:
+        handler(query_string(), form)
     else:
-        path_info = environ.get('PATH_INFO', '')
-        if len(path_info) and path_info[0] == '/':
-            query = path_info[1:] or 'FrontPage'
-        else:
-            query = environ.get('QUERY_STRING', '') or 'FrontPage'
+        send_httperror("403 Forbidden", query_string())
 
-        if file_re.match(query):
-            if word_re.match(query):
-                Page(query).format()
-            else:
-                from mimetypes import MimeTypes
-                type, encoding = MimeTypes().guess_type(query)
-                #type = type or 'text/plain'
-                #Page(query).send_raw(mimetype=type)
-                if type:
-                    if type.startswith('image/'):
-                        Page(query).send_image(mimetype=type,args=form)
-                    else:
-                        Page(query).send_raw(mimetype=type)
-                else:
-                    Page(query).format()
-        else:
-            print "Status: 404 Not Found"
-            send_title(None, msg_text='Can\'t work out query: ' + query)
-            send_footer(None)
 except Exception:
     import traceback
     msg_text = traceback.format_exc()
@@ -810,6 +836,6 @@ except Exception:
         send_guru(msg_text, "error")
     else:
         send_title(None, msg_text=msg_text)
-    send_footer(None)
+    send_footer()
 
 sys.stdout.flush()