Mercurial > genshi > mirror
changeset 1015:203d981d314a stable-0.6.x
Merge r1239 from trunk (fix assert with side-effect in xi:fallback directive processing).
author | hodgestar |
---|---|
date | Mon, 17 Jun 2013 20:54:54 +0000 |
parents | cc85c7207905 |
children | fa0e84724fee |
files | genshi/template/markup.py |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/genshi/template/markup.py +++ b/genshi/template/markup.py @@ -230,7 +230,8 @@ elif kind is END: if fallbacks and data == xinclude_ns['fallback']: - assert streams.pop() is fallbacks[-1] + fallback_stream = streams.pop() + assert fallback_stream is fallbacks[-1] elif data == xinclude_ns['include']: fallback = None if len(fallbacks) == len(includes):