Merge commit 'giskard/master'

[geekigeeki.git] / geekigeeki.py
diff --git a/geekigeeki.py b/geekigeeki.py

index 624a8c72abd7e6b644fc8762d589334d0f357395..00d74ceddf409a7ec29a2c79e80a5f74ffdb3773 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -25,7 +25,7 @@ video_ext = "ogg|ogv|oga" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|a
  image_re = re.compile(r".*\.(" + image_ext + "|" +  video_ext + ")$", re.IGNORECASE)
  video_re = re.compile(r".*\.(" + video_ext + ")$", re.IGNORECASE)
  # FIXME: we accept stuff like foo/../bar and we shouldn't
-file_re  = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)$")
+file_re  = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/ ]*)$")
  url_re   = re.compile(r"[a-z]{3,8}://[^\s'\"]+\S$")
  ext_re   = re.compile(r"\.([^\./]+)$")
  
@@ -550,8 +550,8 @@ class WikiFormatter:
              | (?P<glyph> --)
  
              # Links
-            | (?P<macro> \<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>)
-            | (?P<hurl>  \[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])
+            | (?P<macro> \<\<[^\>]+\>\>)
+            | (?P<hurl>  \[\[[^\]]+\]\])
  
              # Inline HTML
              | (?P<html>             <(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])\b )
@@ -567,7 +567,7 @@ class WikiFormatter:
              # Lists, divs, spans and inline objects
              | (?P<li>    ^\s+[\*\#]\s+)
              | (?P<pre>   \{\{\{|\s*\}\}\})
-            | (?P<inl>   \{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})
+            | (?P<inl>   \{\{[^\}]+\}\})
  
              # Tables
              | (?P<tr>    ^\s*\|\|(=|)\s*)