# HG changeset patch # User cmlenz # Date 1212524553 0 # Node ID 8825ac5014b1e8821dcb40333d27ba38de86ed52 # Parent 01bdf155db95128e73cd41480dd2099bc72eadad 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]?("""|\'\'\')((?