[z3-checkins] r33348 - z3/deliverance/branches/packaged/deliverance

[cabraham at codespeak.net]

Author: cabraham
Date: Mon Oct 16 20:03:35 2006
New Revision: 33348

Modified:
   z3/deliverance/branches/packaged/deliverance/xinclude.py
Log:
fixed bug in xincludes

Modified: z3/deliverance/branches/packaged/deliverance/xinclude.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/xinclude.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/xinclude.py	Mon Oct 16 20:03:35 2006
@@ -121,7 +121,7 @@
                     node.tail = (node.tail or "") + e.tail
                 elem[i] = node
                 # be recursive about including in the included tree
-                include(node,loader)
+                include(node, href, loader)
             elif parse == "text":
                 text = loader(href, parse, e.get("encoding"))
                 if text is None:
@@ -144,6 +144,6 @@
                 "xi:fallback tag must be child of xi:include (%r)" % e.tag
                 )
         else:
-            include(e, loader)
+            include(e, base_href, loader)
         i = i + 1