try:
from socket import gethostbyaddr
return gethostbyaddr(addr)[0] + ' (' + addr + ')'
- except Exception, er:
+ except Exception as er:
return addr
def relative_url(pathname, privileged=False):
# 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 '<pre id="guru" onclick="this.style.display = \'none\'" class="' + msg_type + '">'
+ print('<pre id="guru" onclick="this.style.display = \'none\'" class="' + msg_type + '">')
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 '</pre>'
+ print('\n Guru Meditation #DEADBEEF.ABADC0DE')
+ print('</pre>')
# FIXME: This little JS snippet is harder to pass than ACID 3.0
- print """
+ print("""
<script language="JavaScript" type="text/javascript">
var guru = document.getElementById('guru');
// Firefox 2.0 doesn't take border-color, but returns border-top-color fine
//window.alert("enabled! color='" + color + "'");
guruOn();
}
- </script>"""
+ </script>""")
def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False):
global title_done
# Head
emit_header()
- print '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'
- print ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
- print '<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">'
+ print('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"')
+ print(' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">')
+ print('<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">')
site_name = globals().get('site_name', 'Unconfigured Site')
- print "<head><title>%s: %s</title>" % (site_name, text)
- print ' <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />'
+ print("<head><title>%s: %s</title>" % (site_name, text))
+ print(' <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />')
if not name:
- print ' <meta name="robots" content="noindex,nofollow" />'
+ print(' <meta name="robots" content="noindex,nofollow" />')
for meta in meta_urls:
http_equiv, content = meta
- print ' <meta http-equiv="%s" content="%s" />' % (http_equiv, relative_url(content))
+ print(' <meta http-equiv="%s" content="%s" />' % (http_equiv, relative_url(content)))
for link in link_urls:
rel, href = link
- print ' <link rel="%s" href="%s" />' % (rel, relative_url(href))
+ print(' <link rel="%s" href="%s" />' % (rel, relative_url(href)))
if name and writable and privileged_url is not None:
- print ' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
- % (privileged_path() + '?edit=' + name)
+ print(' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
+ % (privileged_path() + '?edit=' + name))
if history_url is not None:
- print ' <link rel="alternate" type="application/rss+xml" title="RSS" href="%s" />' \
- % relative_url(history_url + '?a=rss')
+ print(' <link rel="alternate" type="application/rss+xml" title="RSS" href="%s" />' \
+ % relative_url(history_url + '?a=rss'))
- print '</head>'
+ print('</head>')
# Body
if name and writable and privileged_url is not None:
- print '<body ondblclick="location.href=\'' + privileged_path() + '?edit=' + name + '\'">'
+ print('<body ondblclick="location.href=\'' + privileged_path() + '?edit=' + name + '\'">')
else:
- print '<body>'
+ print('<body>')
title_done = True
send_guru(msg_text, msg_type)
# Navbar
- print '<div class="nav">'
+ print('<div class="nav">')
if name:
- print ' <b>' + link_tag('?fullsearch=' + name, text, 'navlink') + '</b> '
+ print(' <b>' + link_tag('?fullsearch=' + name, text, 'navlink') + '</b> ')
else:
- print ' <b>' + text + '</b> '
- print ' | ' + link_tag('FrontPage', 'Home', 'navlink')
- print ' | ' + link_tag('FindPage', 'Find Page', 'navlink')
+ print(' <b>' + text + '</b> ')
+ print(' | ' + link_tag('FrontPage', 'Home', 'navlink'))
+ print(' | ' + link_tag('FindPage', 'Find Page', 'navlink'))
if 'history_url' in globals():
- print ' | <a href="' + relative_url(history_url) + '" class="navlink">Recent Changes</a>'
+ print(' | <a href="' + relative_url(history_url) + '" class="navlink">Recent Changes</a>')
if name:
- print ' | <a href="' + relative_url(history_url + '?a=history;f=' + name) + '" class="navlink">Page History</a>'
+ print(' | <a href="' + relative_url(history_url + '?a=history;f=' + name) + '" class="navlink">Page History</a>')
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 ' | <i>Immutable Page</i>'
+ print(' | <i>Immutable Page</i>')
user = remote_user()
if user != 'AnonymousCoward':
- print ' | <span class="login"><i>logged in as <b>' + cgi.escape(user) + '</b></i></span>'
+ print(' | <span class="login"><i>logged in as <b>' + cgi.escape(user) + '</b></i></span>')
- print '<hr /></div>'
+ print('<hr /></div>')
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)
hits.sort()
hits.reverse()
- print "<ul>"
+ print("<ul>")
for (count, page_name) in hits:
- print '<li><p>' + Page(page_name).link_to()
- print ' . . . . ' + `count`
- print ['match', 'matches'][count != 1]
- print '</p></li>'
- print "</ul>"
+ print('<li><p>' + Page(page_name).link_to())
+ print(' . . . . ' + repr(count))
+ print(['match', 'matches'][count != 1])
+ print('</p></li>')
+ print("</ul>")
print_search_stats(len(hits), len(all_pages))
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 "<ul>"
+ print("<ul>")
for filename in hits:
- print '<li><p>' + Page(filename).link_to() + "</p></li>"
- print "</ul>"
+ print('<li><p>' + Page(filename).link_to() + "</p></li>")
+ print("</ul>")
print_search_stats(len(hits), len(all_pages))
def print_search_stats(hits, searched):
- print "<p>%d hits out of %d pages searched.</p>" % (hits, searched)
+ print("<p>%d hits out of %d pages searched.</p>" % (hits, searched))
def handle_raw(pagename):
if not file_re.match(pagename):
pg.send_editor(text)
def make_index_key():
- links = map(lambda ch: '<a href="#%s">%s</a>' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz')
+ links = ['<a href="#%s">%s</a>' % (ch, ch) for ch in 'abcdefghijklmnopqrstuvwxyz']
return '<p><center>'+ ' | '.join(links) + '</center></p>'
def page_list(dir = None, re = word_re):
cgi.print_arguments()
cgi.print_form(form)
cgi.print_environ()
- print '''
+ print('''
<div id="footer"><hr />
<p class="copyright">
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img class="license" alt="Creative Commons License" src="http://i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a>
<span class="benchmark">generated in %0.3fs</span> by <a href="http://www.codewiz.org/wiki/GeekiGeeki">GeekiGeeki</a> version %s
</p>
-''' % (clock() - start_time, __version__)
+''' % (clock() - start_time, __version__))
if mod_string:
- print '<p class="modified">last modified %s</p>' % mod_string
- print '</div></body></html>'
+ print('<p class="modified">last modified %s</p>' % mod_string)
+ print('</div></body></html>')
class WikiFormatter:
"""Object that turns Wiki markup into HTML.
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:
+ exec(open("macros/" + name + ".py").read(), globals())
+ except IOError as er:
if er.errno == errno.ENOENT:
pass
macro = globals().get('_macro_' + name)
return res
def replace(self, match):
- for type, hit in match.groupdict().items():
+ for type, hit in list(match.groupdict().items()):
if hit:
return getattr(self, '_' + type + '_repl')(hit)
else:
- raise "Can't handle match " + `match`
+ raise "Can't handle match " + repr(match)
def print_html(self):
- print '<div class="wiki"><p>'
+ print('<div class="wiki"><p>')
# For each line, we scan through looking for magic
# strings, outputting verbatim any intervening text
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 '</tbody></table><p>'
+ print('</tbody></table><p>')
if blank_re.match(self.line):
- print '</p><p>'
+ print('</p><p>')
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 '</pre>'
- if self.in_table: print '</tbody></table><p>'
- print self._undent()
- print '</p></div>'
+ if self.in_pre: print('</pre>')
+ if self.in_table: print('</tbody></table><p>')
+ print(self._undent())
+ print('</p></div>')
class Page:
def __init__(self, page_name):
return path.join(data_dir, self.page_name)
def _tmp_filename(self):
- return path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#'))
+ return path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + repr(os.getpid()) + '#'))
def exists(self):
try:
os.stat(self._filename())
return True
- except OSError, er:
+ except OSError as er:
if er.errno == errno.ENOENT:
return False
raise er
def get_raw_body(self):
try:
return open(self._filename(), 'rb').read()
- except IOError, er:
+ except IOError as er:
if er.errno == errno.ENOENT:
return '' # just doesn't exist, use default
if er.errno == errno.EISDIR:
break
self.attrs[m.group(1)] = m.group(2).strip()
#print "bernie: attrs[" + m.group(1) + "] = " + m.group(2) + "<br>\n"
- except IOError, er:
+ except IOError as er:
if er.errno != errno.ENOENT and er.errno != errno.EISDIR:
raise er
return self.attrs
if user == remote_user() or user == "All":
return action in perms.split(',')
return False
- except Exception, er:
+ except Exception as er:
if acl:
self.msg_text = 'Illegal acl line: ' + acl
return default
try:
from time import localtime, strftime
modtime = localtime(os.stat(self._filename())[stat.ST_MTIME])
- except OSError, er:
+ except OSError as er:
if er.errno != errno.ENOENT:
raise er
return None
if 'file' in form:
file = form['file'].value
- print
('<p><b>Editing ' + self.page_name
+ print
(('<p><b>Editing ' + self.page_name
+ ' for ' + cgi.escape(remote_user())
+ ' from ' + cgi.escape(get_hostname(remote_host()))
- + '</b></p>')
- print '<div class="editor"><form name="editform" method="post" enctype="multipart/form-data" action="%s">' % relative_url(self.page_name)
- print '<input type="hidden" name="edit" value="%s">' % (self.page_name)
- print '<input type="input" id="editor" name="changelog" value="Edit page %s" accesskey="c" /><br />' % (self.page_name)
- print '<textarea wrap="off" spellcheck="true" id="editor" name="savetext" rows="17" cols="100" accesskey="e">%s</textarea>' % cgi.escape(preview or self.get_raw_body())
- print '<label for="file" accesskey="u">Or Upload a file:</label> <input type="file" name="file" value="%s" />' % file
- print """
+ + '</b></p>'))
+ print('<div class="editor"><form name="editform" method="post" enctype="multipart/form-data" action="%s">' % relative_url(self.page_name))
+ print('<input type="hidden" name="edit" value="%s">' % (self.page_name))
+ print('<input type="input" id="editor" name="changelog" value="Edit page %s" accesskey="c" /><br />' % (self.page_name))
+ print('<textarea wrap="off" spellcheck="true" id="editor" name="savetext" rows="17" cols="100" accesskey="e">%s</textarea>' % cgi.escape(preview or self.get_raw_body()))
+ print('<label for="file" accesskey="u">Or Upload a file:</label> <input type="file" name="file" value="%s" />' % file)
+ print("""
<br />
<input type="submit" name="save" value="Save" accesskey="s">
<input type="submit" name="preview" value="Preview" accesskey="p" />
document.editform.savetext.focus()
//-->
</script>
- """
- print "<p>" + Page('EditingTips').link_to() + "</p>"
+ """)
+ print("<p>" + Page('EditingTips').link_to() + "</p>")
if preview:
- print "<div class='preview'>"
+ print("<div class='preview'>")
WikiFormatter(preview).print_html()
- print "</div>"
+ print("</div>")
send_footer(self.page_name)
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')
# Bad Bill! POSIX rename ought to replace. :-(
try:
os.remove(name)
- except OSError, er:
+ except OSError as er:
if er.errno != errno.ENOENT: raise er
os.rename(tmp_filename, name)
# Main ---------------------------------------------------------------
try:
- execfile("geekigeeki.conf.py")
+ exec(open("geekigeeki.conf.py").read())
form = cgi.FieldStorage()
for cmd in form:
projects / geekigeeki.git / commitdiff