From 825480eaef419fb4a52dfdaee8a71d096da36113 Mon Sep 17 00:00:00 2001 From: Massimo Di Pierro Date: Thu, 19 Apr 2012 22:47:52 -0500 Subject: [PATCH] simpler @{} support --- VERSION | 2 +- gluon/contrib/markmin/markmin2html.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 45887f96..df34cd76 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.7 (2012-04-19 22:33:54) dev +Version 1.99.7 (2012-04-19 22:47:29) dev diff --git a/gluon/contrib/markmin/markmin2html.py b/gluon/contrib/markmin/markmin2html.py index f4908324..c1f36624 100755 --- a/gluon/contrib/markmin/markmin2html.py +++ b/gluon/contrib/markmin/markmin2html.py @@ -366,8 +366,8 @@ def render(text,extra={},allowed={},sep='p',URL=None,environment=None): # this is experimental @{controller/index/args} # turns into a digitally signed URL def u1(match,URL=URL): - a,b,c = match.group('a'), match.group('b'), match.group('c') - return URL(a,b,args=c.split('/'),scheme=True,host=True) + b,c = match.group('a'), match.group('b'), match.group('c') + return URL(b,args=c.split('/'),scheme=True,host=True) text = re.compile( '@\{(?P\w+)/(?P\w+)/(?P.+?)\}' ).sub(u1,text)