# HG changeset patch # User cmlenz # Date 1212524553 0 # Node ID df6a09d69d5c11b9c220803c29398016cb09e2fa # Parent 6514d9889ac8727caeb191ced10183c88cd9f6dd Fix expression interpolation for expression containing triple-quoted multiline strings. Thanks to Armin Ronacher for reporting the issue and providing a patch. diff --git a/genshi/template/interpolation.py b/genshi/template/interpolation.py --- a/genshi/template/interpolation.py +++ b/genshi/template/interpolation.py @@ -17,7 +17,8 @@ from itertools import chain import os -from tokenize import tokenprog +import re +from tokenize import PseudoToken from genshi.core import TEXT from genshi.template.base import TemplateSyntaxError, EXPR @@ -30,6 +31,11 @@ NAMECHARS = NAMESTART + '.0123456789' PREFIX = '$' +token_re = re.compile('%s|%s(?s)' % ( + r'[uU]?[rR]?("""|\'\'\')((?