Changeset 1213 for trunk

Timestamp:

Jan 26, 2013, 12:53:36 PM (11 years ago)

Author:

hodgestar

Message:

Stop try to lex for matching braces in interpolation if the token_re matches an empty string. This fixes the infinite loop triggered by the test suite as a result of the change to Python 2.7 describe in ​http://bugs.python.org/issue16152 and reported in ​http://genshi.edgewall.org/ticket/540.

File:

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

trunk/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:])