X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=inline;f=geekigeeki.py;h=eb51489cddb74e6bf2185f6a0e05ac62ebfb6685;hb=ce5a4dbd3de540928b7019a716859a551961105c;hp=2fb90303413158f3dcd21236f1d3f47fad84018d;hpb=41a64735175f68c54569c9a106766dd8037290e0;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index 2fb9030..eb51489 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -83,18 +83,18 @@ def permalink(s): def humanlink(s): return re.sub(r'(?:.*[/:]|)([^:/\.]+)(?:\.[^/:]+|)$', r'\1', s.replace('_', ' ')) -# Split arg lists like "blah| blah blah| width=100 | align = center", +# Split arg lists like "blah|blah blah| width=100 | align = center", # return a list containing anonymous arguments and a map containing the named arguments def parse_args(s): args = [] - kwargs = {} + kvargs = {} for arg in s.strip('<[{}]>').split('|'): m = re.match('\s*(\w+)\s*=\s*(.+)\s*', arg) if m is not None: - kwargs[m.group(1)] = m.group(2) + kvargs[m.group(1)] = m.group(2) else: args.append(arg.strip()) - return (args, kwargs) + return (args, kvargs) def url_args(kvargs): argv = [] @@ -227,7 +227,7 @@ def link_inline(name, descr=None, kvargs={}): elif image_re.match(name): return '' % (url, url + url_args(kvargs), descr) elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page - return Page(name).send_naked() + return Page(name).send_naked(kvargs) else: return '' \ % (url, url, name) @@ -337,16 +337,14 @@ def send_footer(mod_string=None): cgi.print_arguments() cgi.print_form(form) cgi.print_environ() - print(''' -