dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a problem in template with delimiters, thanks szimszon

Browse Source
This commit is contained in:
Massimo Di Pierro
2012-03-02 10:11:23 -06:00
parent 36f3571590
commit 1622fc5121
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.5 (2012-03-02 10:04:06) stable Version 1.99.5 (2012-03-02 10:11:16) stable
gluon/template.py
+5 -4
View File
@@ -289,10 +289,11 @@ class TemplateParser(object):
if delimiters != self.default_delimiters: if delimiters != self.default_delimiters:
escaped_delimiters = (re.escape(delimiters[0]),re.escape(delimiters[1])) escaped_delimiters = (re.escape(delimiters[0]),re.escape(delimiters[1]))
self.r_tag = re.compile(r'(%s.*?%s)' % escaped_delimiters, re.DOTALL) self.r_tag = re.compile(r'(%s.*?%s)' % escaped_delimiters, re.DOTALL)
elif context['response'].delimiters != self.default_delimiters: elif context.has_key('response'):
escaped_delimiters = (re.escape(context['response'].delimiters[0]), if context['response'].delimiters != self.default_delimiters:
re.escape(context['response'].delimiters[1])) escaped_delimiters = (re.escape(context['response'].delimiters[0]),
self.r_tag = re.compile(r'(%s.*?%s)' % escaped_delimiters, re.DOTALL) re.escape(context['response'].delimiters[1]))
self.r_tag = re.compile(r'(%s.*?%s)' % escaped_delimiters,re.DOTALL)
# Create a root level Content that everything will go into. # Create a root level Content that everything will go into.
self.content = Content(name=name) self.content = Content(name=name)