Changeset 1269

Timestamp:

Mar 20, 2014, 1:58:48 PM (10 years ago)

Author:

hodgestar

Message:

Return correct value and properly namespaced attribute name when matching namespaced attributes with XPath expressions (fixes #572; thanks to Olemis Lang <olemis+trac@…> for bug report and suggestion for fix).

Location:

trunk/genshi

Files:

• path.py (modified) (1 diff)
• tests/path.py (modified) (2 diffs)

trunk/genshi/path.py

@@ -1009 +1009 @@
         if kind is START:
             if self.principal_type is ATTRIBUTE and qname in data[1]:
-                return Attrs([(self.name, data[1].get(self.name))])
+                return Attrs([(qname, data[1].get(qname))])
             else:
                 return data[0] == qname

trunk/genshi/tests/path.py

@@ -15 +15 @@
 import unittest
 
+from genshi.core import Attrs, QName
 from genshi.input import XML
 from genshi.path import Path, PathParser, PathSyntaxError, GenericStrategy, \
@@ -631 +632 @@
                               output='')
 
+    def test_attr_selection(self):
+        xml = XML('<root><foo bar="abc"></foo></root>')
+        path = Path('foo/@bar')
+        result = path.select(xml)
+        self.assertEqual(list(result), [
+            Attrs([(QName('bar'), u'abc')])
+        ])
+
+    def test_attr_selection_with_namespace(self):
+        xml = XML(
+            '<root xmlns:ns1="http://example.com">'
+            '<foo ns1:bar="abc"></foo>'
+            '</root>')
+        path = Path('foo/@ns1:bar')
+        result = path.select(xml, namespaces={'ns1': 'http://example.com'})
+        self.assertEqual(list(result), [
+            Attrs([(QName('http://example.com}bar'), u'abc')])
+        ])
+
     def _test_support(self, strategy_class, text):
         path = PathParser(text, None, -1).parse()[0]