Changes between Version 3 and Version 4 of GenshiRecipes/RecursiveIncludeScanner

Timestamp:

Feb 4, 2008, 7:07:58 PM (16 years ago)

Author:

anonymous

Comment:

Fixed the code to work with current Genshi

GenshiRecipes/RecursiveIncludeScanner

@@ -20 +20 @@
 
 This solution was kindly provided by Christopher Lenz <cmlenz@gmx.de>
+Updated 2008-02-04 to work with changes to Genshi by Stephan Sokolow <http://www.ssokolow.com/ContactMe>
 """
 
-import os,sys
+import os, sys
 from genshi.core import START
-from genshi.filters import IncludeFilter
 from genshi.input import XMLParser
- 
-def scan_xincludes(filename):
-    basedir, filename = os.path.split(filename)
-    namespace = IncludeFilter.NAMESPACE
+
+def scan_xincludes(filepath):
+    basedir, filename = os.path.split(filepath)
     includes = set([filename])
     notfound = set()
     visited = set()
- 
+
     def collect(filename):
         try:
@@ -41 +40 @@
                     if kind is START:
                         tag, attrib = data
-                        if tag in namespace and tag.localname == 'include':
+                        if tag.namespace == 'http://www.w3.org/2001/XInclude' and tag.localname == 'include':
                             includes.add(attrib.get('href'))
             finally:
@@ -50 +49 @@
             notfound.add(filename)
 
- 
     while len(includes) > len(visited):
         for filename in includes - visited:
             collect(filename)
- 
+
     return includes,notfound