Ticket #68: select-namespaces-68-stab1.patch

genshi/path.py

@@ -35 +35 @@
 import re
 
 from genshi.core import Stream, Attrs, Namespace, QName
-from genshi.core import START, END, TEXT, COMMENT, PI
+from genshi.core import START, END, START_NS, END_NS, TEXT, COMMENT, PI
 
 __all__ = ['Path', 'PathSyntaxError']
 
@@ -117 +117 @@
         stream = iter(stream)
         def _generate():
             test = self.test()
+            start_namespace_events = []
+            reverse_namespaces = dict([(value, key) for (key, value) in namespaces.items()])
             for kind, data, pos in stream:
+                if kind is START_NS:
+                    prefix, namespace = data
+                    if namespace in reverse_namespaces:
+                        yield (kind, (reverse_namespaces[namespace], namespace), pos)
                 result = test(kind, data, pos, namespaces, variables)
                 if result is True:
                     yield kind, data, pos
@@ -130 +136 @@
                             depth -= 1
                         yield subkind, subdata, subpos
                         test(subkind, subdata, subpos, namespaces, variables)
+                    start_namespace_events = []
                 elif result:
                     yield result
+                elif kind is END_NS:
+                    yield END_NS, data, pos
         return Stream(_generate())
 
     def test(self, ignore_context=False):