From d1e4ede9b379de89869278870190ad3d4e9f7652 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 3 Sep 2014 10:52:31 -0500 Subject: [PATCH] fixed problem with delimiters, thanks Anthony --- VERSION | 2 +- gluon/globals.py | 1 - gluon/template.py | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 95265916..30b7b922 100644 --- a/VERSION +++ b/VERSION @@ -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 diff --git a/gluon/globals.py b/gluon/globals.py index e81ec9a8..3c2a0f55 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -165,7 +165,6 @@ class Request(Storage): - is_local - is_https - restful() - - settings """ def __init__(self, env): diff --git a/gluon/template.py b/gluon/template.py index 131cb927..9e98f2cf 100644 --- a/gluon/template.py +++ b/gluon/template.py @@ -279,11 +279,11 @@ class TemplateParser(object): self.context = context # allow optional alternative delimiters + if delimiters is None: - delimiters = context.get('response', {})\ - .get('app_settings',{}).get('template_delimiters') + delimiters = context.get('response', {}).get('delimiters') if delimiters != self.default_delimiters: - escaped_delimiters = (escape(elimiters[0]), + escaped_delimiters = (escape(delimiters[0]), escape(delimiters[1])) self.r_tag = compile(r'(%s.*?%s)' % escaped_delimiters, DOTALL) else: