projects
/
geekigeeki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of obsolete apply()
[geekigeeki.git]
/
geekigeeki.py
diff --git
a/geekigeeki.py
b/geekigeeki.py
index 764f3665de6fff91f4e773fc918cdae5adb65a7a..a6158a3122b41b184930bf0255664a428851858d 100755
(executable)
--- a/
geekigeeki.py
+++ b/
geekigeeki.py
@@
-144,7
+144,7
@@
def send_title(name, text="Limbo", msg_text=None, msg_type='error'):
print text + '</b> '
print ' | ' + link_tag('FrontPage', 'Front Page', 'navlink')
print ' | ' + link_tag('FindPage', 'Find Page', 'navlink')
print text + '</b> '
print ' | ' + link_tag('FrontPage', 'Front Page', 'navlink')
print ' | ' + link_tag('FindPage', 'Find Page', 'navlink')
- if
globals().has_key('history_url'
):
+ if
'history_url' in globals(
):
print ' | <a href="' + history_url + '" class="navlink">Recent Changes</a>'
if name:
print ' | <a href="' + history_url + '?a=history;f=' + name + '" class="navlink">Page History</a>'
print ' | <a href="' + history_url + '" class="navlink">Recent Changes</a>'
if name:
print ' | <a href="' + history_url + '?a=history;f=' + name + '" class="navlink">Page History</a>'
@@
-177,7
+177,7
@@
def link_tag(params, text=None, ss_class=None, privileged=False):
# Search ---------------------------------------------------
# Search ---------------------------------------------------
-def
do
_fullsearch(needle):
+def
handle
_fullsearch(needle):
send_title(None, 'Full text search for "%s"' % (needle))
needle_re = re.compile(needle, re.IGNORECASE)
send_title(None, 'Full text search for "%s"' % (needle))
needle_re = re.compile(needle, re.IGNORECASE)
@@
-204,7
+204,7
@@
def do_fullsearch(needle):
print_search_stats(len(hits), len(all_pages))
print_search_stats(len(hits), len(all_pages))
-def
do
_titlesearch(needle):
+def
handle
_titlesearch(needle):
# TODO: check needle is legal -- but probably we can just accept any RE
send_title(None, "Title search for \"" + needle + '"')
# TODO: check needle is legal -- but probably we can just accept any RE
send_title(None, "Title search for \"" + needle + '"')
@@
-222,22
+222,26
@@
def do_titlesearch(needle):
def print_search_stats(hits, searched):
print "<p>%d hits out of %d pages searched.</p>" % (hits, searched)
def print_search_stats(hits, searched):
print "<p>%d hits out of %d pages searched.</p>" % (hits, searched)
-def
do
_raw(pagename):
+def
handle
_raw(pagename):
Page(pagename).send_raw()
Page(pagename).send_raw()
-def
do
_edit(pagename):
+def
handle
_edit(pagename):
pg = Page(pagename)
pg = Page(pagename)
- if 'preview' in form:
- pg.send_editor(form['savetext'].value)
- elif 'save' in form:
- pg.save_text(form['savetext'].value)
+ if 'save' in form:
+ if form['file'].value:
+ pg.save(form['file'].file.read())
+ else:
+ pg.save(form['savetext'].value.replace('\r\n', '\n'))
pg.send_page()
elif 'cancel' in form:
pg.msg_text = 'Editing canceled'
pg.msg_type = 'notice'
pg.send_page()
pg.send_page()
elif 'cancel' in form:
pg.msg_text = 'Editing canceled'
pg.msg_type = 'notice'
pg.send_page()
- else:
- pg.send_editor()
+ else: # preview or edit
+ text = None
+ if 'preview' in form:
+ text = form['savetext'].value
+ pg.send_editor(text)
def make_index_key():
links = map(lambda ch: '<a href="#%s">%s</a>' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz')
def make_index_key():
links = map(lambda ch: '<a href="#%s">%s</a>' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz')
@@
-249,7
+253,7
@@
def page_list():
def send_footer(name, mod_string=None):
if globals().get('debug_cgi', False):
cgi.print_arguments()
def send_footer(name, mod_string=None):
if globals().get('debug_cgi', False):
cgi.print_arguments()
- cgi.print_form(
cgi.FieldStorage()
)
+ cgi.print_form(
form
)
cgi.print_environ()
print '<div id="footer"><hr />'
print ('<p class="copyright"><span class="benchmark">generated in %0.3fs</span>' +
cgi.print_environ()
print '<div id="footer"><hr />'
print ('<p class="copyright"><span class="benchmark">generated in %0.3fs</span>' +
@@
-268,10
+272,9
@@
def _macro_FullSearch(*vargs):
return _macro_search("fullsearch")
def _macro_search(type):
return _macro_search("fullsearch")
def _macro_search(type):
- if form.has_key('value'):
- default = form["value"].value
- else:
- default = ''
+ default = ''
+ if 'value' in form:
+ default = form['value'].value
return """<form method="get"><input name="%s" size="30" value="%s" /><input type="submit" value="Search" /></form>""" % (type, default)
def _macro_WordIndex(*vargs):
return """<form method="get"><input name="%s" size="30" value="%s" /><input type="submit" value="Search" /></form>""" % (type, default)
def _macro_WordIndex(*vargs):
@@
-392,7
+395,7
@@
class PageFormatter:
macro = globals().get('_macro_' + name)
if macro:
macro = globals().get('_macro_' + name)
if macro:
- return
apply(macro, (name, descr)
)
+ return
macro(name, descr
)
elif img_re.match(name):
name = relative_url(name)
# The "extthumb" nonsense works around a limitation of the HTML block model
elif img_re.match(name):
name = relative_url(name)
# The "extthumb" nonsense works around a limitation of the HTML block model
@@
-475,7
+478,7
@@
class PageFormatter:
def replace(self, match):
for type, hit in match.groupdict().items():
if hit:
def replace(self, match):
for type, hit in match.groupdict().items():
if hit:
- return
apply(getattr(self, '_' + type + '_repl'), (hit,)
)
+ return
getattr(self, '_' + type + '_repl')(hit
)
else:
raise "Can't handle match " + `match`
else:
raise "Can't handle match " + `match`
@@
-591,7
+594,7
@@
class Page:
raise er
def get_attrs(self):
raise er
def get_attrs(self):
- if
self.__dict__.has_key('attrs')
:
+ if
'attrs' in self.__dict__
:
return self.attrs
self.attrs = {}
try:
return self.attrs
self.attrs = {}
try:
@@
-621,7
+624,8
@@
class Page:
return action in perms.split(',')
return False
except Exception, er:
return action in perms.split(',')
return False
except Exception, er:
- pass
+ if acl:
+ self.msg_text = 'Illegal acl line: ' + acl
return default
def can_write(self):
return default
def can_write(self):
@@
-662,13
+666,18
@@
class Page:
send_guru("Write access denied by ACLs", "error")
return
send_guru("Write access denied by ACLs", "error")
return
+ file = ''
+ if 'file' in form:
+ file = form['file'].value
+
print ('<p><b>Editing ' + self.page_name
+ ' for ' + cgi.escape(remote_user())
+ ' from ' + cgi.escape(get_hostname(remote_host()))
+ '</b></p>')
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 method="post" action="%s">' % relative_url(self.page_name)
+ print '<div class="editor"><form 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="hidden" name="edit" value="%s">' % (self.page_name)
- print """<textarea wrap="off" spellcheck="true" id="editor" name="savetext" rows="17" cols="100">%s</textarea>""" % (preview or self.get_raw_body())
+ print '<textarea wrap="off" spellcheck="true" id="editor" name="savetext" rows="17" cols="100">%s</textarea>' % (preview or self.get_raw_body())
+ print 'Or upload a file: <input type="file" name="file" value="%s" />' % file
print """
<br />
<input type="submit" name="save" value="Save" />
print """
<br />
<input type="submit" name="save" value="Save" />
@@
-692,25
+701,25
@@
class Page:
else:
send_title(None, msg_text='Read access denied by ACLs', msg_type='notice')
else:
send_title(None, msg_text='Read access denied by ACLs', msg_type='notice')
- def _write_file(self,
text
):
+ def _write_file(self,
data
):
tmp_filename = self._tmp_filename()
tmp_filename = self._tmp_filename()
- open(tmp_filename, 'w
t').write(text.replace('\r\n', '\n')
)
-
text
= self._text_filename()
+ open(tmp_filename, 'w
b').write(data
)
+
name
= self._text_filename()
if os.name == 'nt':
# Bad Bill! POSIX rename ought to replace. :-(
try:
if os.name == 'nt':
# Bad Bill! POSIX rename ought to replace. :-(
try:
- os.remove(
text
)
+ os.remove(
name
)
except OSError, er:
if er.errno != errno.ENOENT: raise er
except OSError, er:
if er.errno != errno.ENOENT: raise er
- os.rename(tmp_filename,
text
)
+ os.rename(tmp_filename,
name
)
- def save
_text(self, newtext
):
+ def save
(self, newdata
):
if not self.can_write():
self.msg_text = 'Write access denied by ACLs'
self.msg_type = 'error'
return
if not self.can_write():
self.msg_text = 'Write access denied by ACLs'
self.msg_type = 'error'
return
- self._write_file(new
text
)
+ self._write_file(new
data
)
rc = 0
if post_edit_hook:
# FIXME: what's the std way to perform shell quoting in python?
rc = 0
if post_edit_hook:
# FIXME: what's the std way to perform shell quoting in python?
@@
-735,16
+744,11
@@
class Page:
try:
execfile("geekigeeki.conf.py")
form = cgi.FieldStorage()
try:
execfile("geekigeeki.conf.py")
form = cgi.FieldStorage()
- handlers = {
- 'fullsearch': do_fullsearch,
- 'titlesearch': do_titlesearch,
- 'edit': do_edit,
- 'raw': do_raw,
- }
-
- for cmd in handlers.keys():
- if form.has_key(cmd):
- apply(handlers[cmd], (form[cmd].value,))
+
+ for cmd in form:
+ handler = globals().get('handle_' + cmd)
+ if handler:
+ handler(form[cmd].value)
break
else:
path_info = environ.get('PATH_INFO', '')
break
else:
path_info = environ.get('PATH_INFO', '')
@@
-759,10
+763,12
@@
try:
else:
from mimetypes import MimeTypes
type, encoding = MimeTypes().guess_type(query)
else:
from mimetypes import MimeTypes
type, encoding = MimeTypes().guess_type(query)
+ type = type or 'text/plain'
Page(query).send_raw(mimetype=type)
else:
print "Status: 404 Not Found"
send_title(None, msg_text='Can\'t work out query: ' + query)
Page(query).send_raw(mimetype=type)
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()
except Exception:
import traceback
msg_text = traceback.format_exc()