Changeset 1214

Timestamp:

Jan 26, 2013, 12:59:30 PM (11 years ago)

Author:

hodgestar

Message:

Merge r1213 from trunk (fix infinite loop in interpolation brace matching caused by a change in 2.7).

Location:

branches/stable/0.6.x

Files:

• . (modified) (1 prop)
• genshi/template/interpolation.py (modified) (1 diff)

branches/stable/0.6.x/genshi/template/interpolation.py

@@ -116 +116 @@
             while level:
                 match = token_re.match(text, pos)
-                if match is None:
+                if match is None or not match.group():
+                    # if there isn't a match or the match is the empty
+                    # string, we're not going to match up braces ever
                     raise TemplateSyntaxError('invalid syntax',  filepath,
                                               *textpos[1:])