X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=6e1ba6ea4a5a2c9ddd808ebe717d499d8cb8731e;hb=refs%2Fheads%2Fpython3;hp=1e2b065d05705ba8851177338d651429809590a4;hpb=adf0fd62361a085ac014efa4985647864a46f603;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index 1e2b065..6e1ba6e 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
@@ -24,7 +24,6 @@ from time import clock
start_time = clock()
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)
@@ -41,25 +40,25 @@ title_done = False
# CGI stuff ---------------------------------------------------------
def script_name():
- return environ.get('SCRIPT_NAME', '')
+ return os.environ.get('SCRIPT_NAME', '')
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 relative_url(pathname, privileged=False):
@@ -76,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
@@ -116,77 +115,76 @@ 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))
+ 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 ' |
logged in as ' + cgi.escape(user) + ''
+ print(' |
logged in as ' + cgi.escape(user) + '')
- 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(None)
+ send_footer()
def link_tag(params, text=None, ss_class=None, privileged=False):
if text is None:
@@ -220,13 +218,13 @@ def handle_fullsearch(needle):
hits.sort()
hits.reverse()
- print "")
print_search_stats(len(hits), len(all_pages))
@@ -236,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):
@@ -278,27 +276,27 @@ 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(dir = None, re = word_re):
- return sorted(filter(re.match, os.listdir(dir or data_dir)))
+def page_list(dirname = None, re = word_re):
+ 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 '''
+ print('''
'
+ print('last modified %s
' % mod_string)
+ print('')
class WikiFormatter:
"""Object that turns Wiki markup into HTML.
@@ -351,8 +349,8 @@ class WikiFormatter:
return Page(word).link_to()
def _img_repl(self, word):
- path = relative_url(word)
- return '' % (path, path)
+ pathname = relative_url(word)
+ return '' % (pathname, pathname)
def _url_repl(self, word):
if img_re.match(word):
@@ -366,15 +364,14 @@ 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, er:
- if er.errno == errno.ENOENT:
- pass
+ exec(open("macros/" + name + ".py").read(), globals())
+ except IOError as err:
+ if err.errno == errno.ENOENT: pass
macro = globals().get('_macro_' + name)
if macro:
return macro(argv)
@@ -493,14 +490,14 @@ 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 ''
+ print('
')
# For each line, we scan through looking for magic
# strings, outputting verbatim any intervening text
@@ -519,7 +516,7 @@ class WikiFormatter:
+ r"|(?P\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
# Inline HTML
- + r"|(?P<(/|)(br|hr|div|span|form|iframe|input|textarea|a))"
+ + r"|(?P<(/|)(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])[^>]*>)"
+ r"|(?P[<>&])"
# Auto links (LEGACY)
@@ -547,31 +544,31 @@ 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()):
- # Skip ACLs
+ for self.line in eol_re.split(str(self.raw.expandtabs(), 'utf-8')):
+ # 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)
+ 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,19 +581,19 @@ 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 as err:
+ if err.errno == errno.ENOENT:
return False
- raise er
+ raise err
def link_to(self):
word = self.page_name
@@ -608,61 +605,61 @@ class Page:
def get_raw_body(self):
try:
return open(self._filename(), 'rb').read()
- except IOError, er:
- if er.errno == errno.ENOENT:
+ except IOError as err:
+ if err.errno == errno.ENOENT:
return '' # just doesn't exist, use default
- if er.errno == errno.EISDIR:
+ 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 img_re.match(filename):
if image_maxwidth:
maxwidth_arg = '|maxwidth=' + str(image_maxwidth)
- out += '{{' + self.page_name + '/' + file + '|' + file + maxwidth_arg + '}}\n'
+ out += '{{' + self.page_name + '/' + filename + '|' + filename + maxwidth_arg + '}}\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 as 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
@@ -681,7 +678,7 @@ 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 ] ]
@@ -689,15 +686,15 @@ class Page:
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 as err:
+ if err.errno != errno.ENOENT:
+ raise err
return None
return strftime(datetime_fmt, modtime)
@@ -707,20 +704,20 @@ 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 '