# HG changeset patch
# User hodgestar
# Date 1371502450 0
# Node ID 2069c7a0059c2ed2cdac1621823ac7d94fb3caa5
# Parent  4317e7c4729b3e1f87ca7a3ea62a1ee202750884
Merge r1239 from trunk (fix assert with side-effect in xi:fallback directive processing).

diff --git a/genshi/template/markup.py b/genshi/template/markup.py
--- 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):