|
@@ -35,9 +35,16 @@ class XmlDict:
|
|
value_node = self._get_value_node(key)
|
|
value_node = self._get_value_node(key)
|
|
return XmlDict._parse_value_node(value_node)
|
|
return XmlDict._parse_value_node(value_node)
|
|
|
|
|
|
- def values(self):
|
|
|
|
|
|
+ def items(self):
|
|
for key_node, value_node in zip(*[iter(self._node)] * 2):
|
|
for key_node, value_node in zip(*[iter(self._node)] * 2):
|
|
- yield XmlDict._parse_value_node(value_node)
|
|
|
|
|
|
+ assert key_node.tag == 'key'
|
|
|
|
+ key = key_node.text
|
|
|
|
+ value = XmlDict._parse_value_node(value_node)
|
|
|
|
+ yield (key, value)
|
|
|
|
+
|
|
|
|
+ def values(self):
|
|
|
|
+ for key, value in self.items():
|
|
|
|
+ yield value
|
|
|
|
|
|
|
|
|
|
class XmlLibrary:
|
|
class XmlLibrary:
|