X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=blobdiff_plain;f=geekigeeki.py;h=ca16283d5ea2f2c78c573b3863a371add9c15aef;hp=0ff2e7a007527f0d2fa2ce9e9212ceffd839e88e;hb=7ce906e26b7c2c91e232508ccd0af6fe9ec4aeec;hpb=6fe435b1dba5647a83349f69fe95eb3c02758997 diff --git a/geekigeeki.py b/geekigeeki.py index 0ff2e7a..ca16283 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3.0 # -*- coding: utf-8 -*- # # Copyright 1999, 2000 Martin Pool @@ -75,19 +75,19 @@ def permalink(s): # 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 '\n      Guru Meditation #DEADBEEF.ABADC0DE'
-    print '
'
+        print('\n      Guru Meditation #DEADBEEF.ABADC0DE')
+    print('
') # FIXME: This little JS snippet is harder to pass than ACID 3.0 - print """ + print(""" """ + """) def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False): global title_done @@ -115,74 +115,74 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal # Head emit_header() - print '' - print '' + print('') + print('') - 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)) + 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() + '?edit=' + 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('
') if name: - print ' ' + link_tag('?fullsearch=' + name, text, 'navlink') + ' ' + print(' ' + link_tag('?fullsearch=' + name, text, 'navlink') + ' ') else: - print ' ' + text + ' ' - print ' | ' + link_tag('FrontPage', 'Home', 'navlink') - print ' | ' + link_tag('FindPage', 'Find Page', 'navlink') + print(' ' + text + ' ') + print(' | ' + link_tag('FrontPage', 'Home', 'navlink')) + print(' | ' + link_tag('FindPage', 'Find Page', '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('?raw=' + name, 'Raw Text', 'navlink')) if privileged_url is not None: if writable: - print ' | ' + link_tag('?edit=' + name, 'Edit', 'navlink', privileged=True) + print(' | ' + link_tag('?edit=' + name, 'Edit', 'navlink', privileged=True)) else: - print ' | ' + link_tag(name, 'Login', 'navlink', privileged=True) + print(' | ' + link_tag(name, 'Login', '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 + print("Status: %s" % status) send_title(None, msg_text=("%s: on query '%s'" % (status, query))) send_footer() @@ -218,13 +218,13 @@ def handle_fullsearch(needle): hits.sort() hits.reverse() - print "") print_search_stats(len(hits), len(all_pages)) @@ -234,17 +234,17 @@ def handle_titlesearch(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_search_stats(len(hits), len(all_pages)) def print_search_stats(hits, searched): - print "

%d hits out of %d pages searched.

" % (hits, searched) + print("

%d hits out of %d pages searched.

" % (hits, searched)) def handle_raw(pagename): if not file_re.match(pagename): @@ -276,7 +276,7 @@ def handle_edit(pagename): pg.send_editor(text) def make_index_key(): - links = map(lambda ch: '%s' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz') + links = ['%s' % (ch, ch) for ch in 'abcdefghijklmnopqrstuvwxyz'] return '

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

' def page_list(dirname = None, re = word_re): @@ -287,16 +287,16 @@ def send_footer(mod_string=None): cgi.print_arguments() cgi.print_form(form) cgi.print_environ() - print ''' + print(''' ' + print('

last modified %s

' % mod_string) + print('') class WikiFormatter: """Object that turns Wiki markup into HTML. @@ -364,13 +364,13 @@ class WikiFormatter: argv = [name] if m.group(2): argv.extend(m.group(2).split('|')) - argv = map(str.strip, argv) + argv = list(map(str.strip, argv)) macro = globals().get('_macro_' + name) if not macro: try: - execfile("macros/" + name + ".py", globals()) - except IOError, err: + exec(open("macros/" + name + ".py").read(), globals()) + except IOError as err: if err.errno == errno.ENOENT: pass macro = globals().get('_macro_' + name) if macro: @@ -490,14 +490,14 @@ class WikiFormatter: return res def replace(self, match): - for rule, hit in match.groupdict().items(): + for rule, hit in list(match.groupdict().items()): if hit: return getattr(self, '_' + rule + '_repl')(hit) else: raise "Can't handle match " + repr(match) def print_html(self): - print '

' + print('

') # For each line, we scan through looking for magic # strings, outputting verbatim any intervening text @@ -544,7 +544,7 @@ class WikiFormatter: 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()): + for self.line in eol_re.split(str(self.raw.expandtabs())): # Skip pragmas if self.in_header: if self.line.startswith('#'): @@ -552,23 +552,23 @@ class WikiFormatter: 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) + print(self._indent_to(len(indent.group(0))), end=' ') + 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): @@ -584,13 +584,13 @@ class Page: return os.path.join(data_dir, self.page_name) def _tmp_filename(self): - return os.path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#')) + return os.path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + repr(os.getpid()) + '#')) def exists(self): try: os.stat(self._filename()) return True - except OSError, err: + except OSError as err: if err.errno == errno.ENOENT: return False raise err @@ -605,7 +605,7 @@ class Page: def get_raw_body(self): try: return open(self._filename(), 'rb').read() - except IOError, err: + except IOError as err: if err.errno == errno.ENOENT: return '' # just doesn't exist, use default if err.errno == errno.EISDIR: @@ -631,19 +631,18 @@ class Page: def pragmas(self): if not '_pragmas' in self.__dict__: - self._pragmas = {} try: - f = open(self._filename(), 'rt') + file = open(self._filename(), 'rt') attr_re = re.compile(r"^#(\S*)(.*)$") - for line in f: + 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: + #print "bernie: pragmas[" + m.group(1) + "] = " + m.group(2) + "
\n" + except IOError as err: if err.errno != errno.ENOENT and err.errno != errno.EISDIR: - raise err + raise er return self._pragmas def pragma(self, name, default): @@ -692,7 +691,7 @@ class Page: try: from time import localtime, strftime modtime = localtime(os.stat(self._filename())[stat.ST_MTIME]) - except OSError, err: + except OSError as err: if err.errno != errno.ENOENT: raise err return None @@ -708,16 +707,16 @@ class Page: if 'file' in form: 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 '
' % (self.page_name) - print '' % cgi.escape(preview or self.get_raw_body()) - print ' ' % filename - print """ + + '

')) + print('
' % relative_url(self.page_name)) + print('' % (self.page_name)) + print('
' % (self.page_name)) + print('' % cgi.escape(preview or self.get_raw_body())) + print(' ' % filename) + print("""
@@ -730,19 +729,19 @@ class Page: document.editform.savetext.focus() //--> - """ - print "

" + Page('EditingTips').link_to() + "

" + """) + print("

" + Page('EditingTips').link_to() + "

") if preview: - print "
" + print("
") WikiFormatter(preview).print_html() - print "
" + print("
") send_footer() def send_raw(self, mimetype='text/plain'): if self.can_read(): body = self.get_raw_body() emit_header(mimetype) - print body + print(body) else: send_title(None, msg_text='Read access denied by ACLs', msg_type='notice') @@ -764,7 +763,7 @@ class Page: # Bad Bill! POSIX rename ought to replace. :-( try: os.remove(name) - except OSError, err: + except OSError as err: if err.errno != errno.ENOENT: raise err os.rename(tmp_filename, name) @@ -826,7 +825,7 @@ def main(): send_httperror("403 Forbidden", query) try: - execfile("geekigeeki.conf.py") + exec(open("geekigeeki.conf.py").read()) form = cgi.FieldStorage() main() except Exception: