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

fixed problem with delimiters, thanks Anthony

Browse Source
This commit is contained in:
mdipierro
2014-09-03 10:52:31 -05:00
parent f1ab50fb91
commit d1e4ede9b3
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.9.6-stable+timestamp.2014.09.02.12.17.18 Version 2.9.6-stable+timestamp.2014.09.03.10.52.25
gluon/globals.py
-1
View File
@@ -165,7 +165,6 @@ class Request(Storage):
- is_local - is_local
- is_https - is_https
- restful() - restful()
- settings
""" """
def __init__(self, env): def __init__(self, env):
gluon/template.py
+3 -3
View File
@@ -279,11 +279,11 @@ class TemplateParser(object):
self.context = context self.context = context
# allow optional alternative delimiters # allow optional alternative delimiters
if delimiters is None: if delimiters is None:
delimiters = context.get('response', {})\ delimiters = context.get('response', {}).get('delimiters')
.get('app_settings',{}).get('template_delimiters')
if delimiters != self.default_delimiters: if delimiters != self.default_delimiters:
escaped_delimiters = (escape(elimiters[0]), escaped_delimiters = (escape(delimiters[0]),
escape(delimiters[1])) escape(delimiters[1]))
self.r_tag = compile(r'(%s.*?%s)' % escaped_delimiters, DOTALL) self.r_tag = compile(r'(%s.*?%s)' % escaped_delimiters, DOTALL)
else: else: