From 8c5422d2d6dba51f947ef5e2251c91fb127b5b35 Mon Sep 17 00:00:00 2001
From: Jonathan New <jonathannew@chc.org.sg>
Date: Thu, 4 Sep 2014 19:16:00 +0800
Subject: [PATCH] fix custom view delimiters

---
 gluon/template.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gluon/template.py b/gluon/template.py
index 9e98f2cf..7a18e7ea 100644
--- a/gluon/template.py
+++ b/gluon/template.py
@@ -280,14 +280,18 @@ class TemplateParser(object):
 
         # allow optional alternative delimiters
         
-        if delimiters is None:
-            delimiters = context.get('response', {}).get('delimiters')
         if delimiters != self.default_delimiters:
             escaped_delimiters = (escape(delimiters[0]),
                                   escape(delimiters[1]))
             self.r_tag = compile(r'(%s.*?%s)' % escaped_delimiters, DOTALL)
-        else:
-            delimiters = self.default_delimiters
+        elif hasattr(context.get('response', None), 'delimiters'):
+            if context['response'].delimiters != self.default_delimiters:
+                delimiters = context['response'].delimiters
+                escaped_delimiters = (
+                    escape(delimiters[0]),
+                    escape(delimiters[1]))
+                self.r_tag = compile(r'(%s.*?%s)' % escaped_delimiters,
+                                     DOTALL)
         self.delimiters = delimiters
 
         # Create a root level Content that everything will go into.