response.formstyle, reponse.label_separator

gluon/template.py

@@ -279,18 +279,16 @@ class TemplateParser(object):
         self.context = context
 
         # allow optional alternative delimiters
-        self.delimiters = delimiters
+        if delimiters is None:
+            delimiters = context.get('response', {})\
+                .get('app_settings',{}).get('template_delimiters')
         if delimiters != self.default_delimiters:
-            escaped_delimiters = (escape(delimiters[0]),
+            escaped_delimiters = (escape(elimiters[0]),
                                   escape(delimiters[1]))
             self.r_tag = compile(r'(%s.*?%s)' % escaped_delimiters, DOTALL)
-        elif hasattr(context.get('response', None), 'delimiters'):
-            if context['response'].delimiters != self.default_delimiters:
-                escaped_delimiters = (
-                    escape(context['response'].delimiters[0]),
-                    escape(context['response'].delimiters[1]))
-                self.r_tag = compile(r'(%s.*?%s)' % escaped_delimiters,
-                                     DOTALL)
+        else:
+            delimiters = self.default_delimiters
+        self.delimiters = delimiters
 
         # Create a root level Content that everything will go into.
         self.content = Content(name=name)
@@ -569,7 +567,8 @@ class TemplateParser(object):
                     line = i
 
                     # Get rid of delimiters
-                    line = line[len(self.delimiters[0]):-len(self.delimiters[1])].strip()
+                    line = line[len(self.delimiters[0]): \
+                                    -len(self.delimiters[1])].strip()
 
                     # This is bad juju, but let's do it anyway
                     if not line: