section and tag names can include aesthetic whitespace

mikeal · Nov 13, 2009 · c63d008 · c63d008
1 parent de25342
commit c63d008
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/examples/complex_view.mustache b/examples/complex_view.mustache
@@ -2,9 +2,9 @@
 {{#list}}
   <ul>
   {{#item}}
-    {{#current}}
+    {{# current }}
       <li><strong>{{name}}</strong></li>
-    {{/current}}
+    {{/ current }}
     {{#link}}
       <li><a href="{{url}}">{{name}}</a></li>
     {{/link}}

diff --git a/pystache/template.py b/pystache/template.py
@@ -43,7 +43,7 @@ def compile_regexps(self):
         section = r"%(otag)s\#([^\}]*)%(ctag)s\s*(.+?)\s*%(otag)s/\1%(ctag)s"
         self.section_re = re.compile(section % tags, re.M|re.S)
 
-        tag = r"%(otag)s(#|=|!|>|\{)?\s*(.+?)\s*\1?%(ctag)s+"
+        tag = r"%(otag)s(#|=|!|>|\{)?(.+?)\1?%(ctag)s+"
         self.tag_re = re.compile(tag % tags)
 
     def render_sections(self, template, context):
@@ -54,6 +54,7 @@ def render_sections(self, template, context):
                 break
 
             section, section_name, inner = match.group(0, 1, 2)
+            section_name = section_name.strip()
 
             it = context.get(section_name, None)
             replacer = ''
@@ -77,6 +78,7 @@ def render_tags(self, template, context):
                 break
 
             tag, tag_type, tag_name = match.group(0, 1, 2)
+            tag_name = tag_name.strip()
             func = 'render_' + self.tag_types[tag_type]
 
             if hasattr(self, func):