projects
/
geekigeeki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move default text handling outside of get_raw_body()
[geekigeeki.git]
/
geekigeeki.py
diff --git
a/geekigeeki.py
b/geekigeeki.py
index 2dbf03b82674125d32d0ddedbdcb9e58224c2cf7..4a7ffea7e6250f80fe59a09e9053cf11f4128b4e 100755
(executable)
--- a/
geekigeeki.py
+++ b/
geekigeeki.py
@@
-494,8
+494,6
@@
class WikiFormatter:
| (?P<tr> ^\s*\|\|(=|)\s*)
| (?P<tre> \s*\|\|(=|)\s*$)
| (?P<td> \s*\|\|(=|)\s*)
| (?P<tr> ^\s*\|\|(=|)\s*)
| (?P<tre> \s*\|\|(=|)\s*$)
| (?P<td> \s*\|\|(=|)\s*)
-
- # TODO: highlight search words (look at referrer)
)""", re.VERBOSE)
pre_re = re.compile("""(?:
(?P<pre>\s*\}\}\})
)""", re.VERBOSE)
pre_re = re.compile("""(?:
(?P<pre>\s*\}\}\})
@@
-570,14
+568,12
@@
class Page:
return True
return False
return True
return False
- def get_raw_body(self
, default=None
):
+ def get_raw_body(self):
try:
return open(self._filename(), 'rb').read()
except IOError, err:
if err.errno == errno.ENOENT:
try:
return open(self._filename(), 'rb').read()
except IOError, err:
if err.errno == errno.ENOENT:
- if default is None:
- default = '//[[%s?a=edit|Describe %s]]//' % (self.page_name, self.page_name)
- return default
+ return ''
if err.errno == errno.EISDIR:
return self.format_dir()
raise err
if err.errno == errno.EISDIR:
return self.format_dir()
raise err
@@
-722,13
+718,16
@@
class Page:
link_inline(footer, kvargs = {
'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%Y-%m-%dT%I:%M:%S%p'), localtime(self._mtime()))
})
link_inline(footer, kvargs = {
'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%Y-%m-%dT%I:%M:%S%p'), localtime(self._mtime()))
})
- print(
"</body></html>"
)
+ print(
'</body></html>'
)
def send_naked(self, kvargs=None):
if self.can_read():
def send_naked(self, kvargs=None):
if self.can_read():
- WikiFormatter(self.get_raw_body(), kvargs).print_html()
+ body = self.get_raw_body()
+ if not body:
+ body = "//[[%s?a=edit|Describe %s]]//" % (self.page_name, self.page_name)
+ WikiFormatter(body, kvargs).print_html()
else:
else:
- send_guru(
"Read access denied by ACLs", "notice"
)
+ send_guru(
'Read access denied by ACLs', 'notice'
)
def send(self):
#css foo.css
def send(self):
#css foo.css
@@
-760,7
+759,7
@@
class Page:
return
if preview is None:
return
if preview is None:
- preview = self.get_raw_body(
default=''
)
+ preview = self.get_raw_body()
link_inline("sys/EditPage", kvargs = {
'EDIT_BODY': cgi.escape(preview),
link_inline("sys/EditPage", kvargs = {
'EDIT_BODY': cgi.escape(preview),