Simplify code in a few places

diff --git a/geekigeeki.css b/geekigeeki.css
index d600b7c6313e76d882a7aa8ed0b0ee00feadcdd0..06733134146424cb11f075a18365c88216f81826 100755 (executable)
--- a/geekigeeki.css
+++ b/geekigeeki.css
@@ -124,18 +124,18 @@ h4:hover .heading, h5:hover .heading, h6:hover .heading {
        visibility: visible;
 }
 
-strong.success {
-    padding-left: 0.1em;
+strong.DONE {
+       padding-left: 0.1em;
        background-color: #22ee22;
 }
 
-strong.notice {
-    padding-left: 0.1em;
+strong.TODO {
+       padding-left: 0.1em;
        background-color: #ffdd44;
 }
 
-strong.error {
-    padding-left: 0.1em;
+strong.FIXME {
+       padding-left: 0.1em;
        background-color: #ee2222;
 }
 

diff --git a/geekigeeki.py b/geekigeeki.py
index 84f1db5f3a0305e5f9ef8a39ca101335b75356f6..5340646c63101b24629d96a26ff2adea8e66a3b7 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -325,11 +325,11 @@ def _macro_TitleIndex(*vargs):
     for name in pages:
         letter = string.lower(name[0])
         if letter != current_letter:
-            s = s + '<a name="%s"><h3>%s</h3></a>' % (letter, letter)
+            s += '<a name="%s"><h3>%s</h3></a>' % (letter, letter)
             current_letter = letter
         else:
-            s = s + '<br />'
-        s = s + Page(name).link_to()
+            s += '<br />'
+        s += Page(name).link_to()
     return s
 
 
@@ -437,13 +437,7 @@ class PageFormatter:
         return ''
 
     def _hi_repl(self, word):
-        if word == 'FIXME':
-            cl = 'error'
-        elif word == 'DONE':
-            cl = 'success'
-        elif word == 'TODO':
-            cl = 'notice'
-        return '<strong class="highlight ' + cl + '">' + word + '</strong>'
+        return '<strong class="highlight ' + word + '">' + word + '</strong>'
 
     def _tr_repl(self, word):
         out = ''
@@ -531,6 +525,7 @@ class PageFormatter:
         pre_re = re.compile(
             r"(?:"
             + r"(?P<pre>\s*\}\}\})"
+            + r"|(?P<ent>[<>&])"
             + r")")
         blank_re = re.compile(r"^\s*$")
         indent_re = re.compile(r"^\s*")
@@ -579,7 +574,7 @@ class Page:
         return path.join(data_dir, self.page_name)
 
     def _tmp_filename(self):
-        return path.join(data_dir, ('#' + self.page_name + '.' + `os.getpid()` + '#'))
+        return path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#'))
 
     def exists(self):
         try:
@@ -588,8 +583,7 @@ class Page:
         except OSError, er:
             if er.errno == errno.ENOENT:
                 return False
-            else:
-                raise er
+            raise er
 
     def link_to(self):
         word = self.page_name
@@ -625,10 +619,7 @@ class Page:
         return self.attrs
 
     def get_attr(self, name, default):
-        if self.get_attrs().has_key(name):
-            return self.get_attrs()[name]
-        else:
-            return default
+        return self.get_attrs().get(name, default)
 
     def can(self, action, default=True):
         try:
@@ -637,10 +628,7 @@ class Page:
             for rule in acl.split():
                 (user,perms) = rule.split(':')
                 if user == remote_user() or user == "All":
-                    if action in perms.split(','):
-                        return True
-                    else:
-                        return False
+                    return action in perms.split(',')
             return False
         except Exception, er:
             pass