X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=1e2b065d05705ba8851177338d651429809590a4;hb=adf0fd62361a085ac014efa4985647864a46f603;hp=a7e99ed10121c9af816cfc76eddc0707edeeec94;hpb=152bbe08d73f7ffa9b8fa9f5a841ac643f3d75a5;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index a7e99ed..1e2b065 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -126,6 +126,10 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal if not name: print ' ' + for meta in meta_urls: + http_equiv, content = meta + print ' ' % (http_equiv, relative_url(content)) + for link in link_urls: rel, href = link print ' ' % (rel, relative_url(href)) @@ -366,7 +370,11 @@ class WikiFormatter: macro = globals().get('_macro_' + name) if not macro: - execfile("macros/" + name + ".py", globals()) + try: + execfile("macros/" + name + ".py", globals()) + except IOError, er: + if er.errno == errno.ENOENT: + pass macro = globals().get('_macro_' + name) if macro: return macro(argv) @@ -511,7 +519,7 @@ class WikiFormatter: + r"|(?P\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])" # Inline HTML - + r"|(?P<(/|)(br|hr|div|form|iframe|input|span))" + + r"|(?P<(/|)(br|hr|div|span|form|iframe|input|textarea|a))" + r"|(?P[<>&])" # Auto links (LEGACY) @@ -710,7 +718,7 @@ class Page: print '
' % relative_url(self.page_name) print '' % (self.page_name) print '
' % (self.page_name) - print '' % (preview or self.get_raw_body()) + print '' % cgi.escape(preview or self.get_raw_body()) print ' ' % file print """