tranfering attributes to dictnodes

Author: Arzaroth Lekva

rapidxml/c_ext/src/document_object.cpp

@@ -19,7 +19,7 @@
 #include <common.h>
 
 static void rapidxml_DocumentObject_dealloc(rapidxml_DocumentObject* self) {
-  delete self->base.base.underlying_obj;
+  delete self->base.base.document;
   Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self));
 }
 

rapidxml/c_ext/src/node_object.cpp

@@ -404,7 +404,6 @@ static PyObject* rapidxml_NodeObject_remove_all_attributes(rapidxml_NodeObject*
 static PyObject* rapidxml_NodeObject_unparse(rapidxml_NodeObject* self,
                                              PyObject* args,
                                              PyObject* kwds) {
-  int pretty = 0;
   PyObject* pretty_obj = NULL;
   std::string xml;
   char kw_pretty[] = "pretty";

rapidxml/rapidxml.py

@@ -9,35 +9,49 @@
 import _rapidxml
 
 class DictNodeIterator(object):
-    def __init__(self, iterable):
+    def __init__(self,
+                 iterable,
+                 attribute_prefix,
+                 cdata_key,
+                 always_aslist):
         self._iter = iterable
+        self.attribute_prefix = attribute_prefix
+        self.cdata_key = cdata_key
+        self.always_aslist = always_aslist
 
     def __next__(self):
         return self.next()
 
     def next(self):
-        return DictNode().copy(next(self._iter))
+        return DictNode(self.attribute_prefix,
+                        self.cdata_key,
+                        self.always_aslist).copy(next(self._iter))
 
     def __iter__(self):
         return self
 
 
 class DictNode(_rapidxml.Node):
-    def __init__(self, attribute_prefix='@', cdata_key='#text'):
+    def __init__(self, attribute_prefix='@', cdata_key='#text', always_aslist=False):
         _rapidxml.Node.__init__(self)
         self.attribute_prefix = attribute_prefix
         self.cdata_key = cdata_key
+        self.always_aslist = always_aslist
 
     def get_nodes(self, name):
         node = self.first_node(name)
         if node is None:
             return None
-        res = [DictNode(self.attribute_prefix, self.cdata_key).copy(node)]
+        res = [DictNode(self.attribute_prefix,
+                        self.cdata_key,
+                        self.always_aslist).copy(node)]
         node = node.next_sibling(name)
-        if node is None:
+        if node is None and not self.always_aslist:
             return res[0]
         while node is not None:
-            res.append(DictNode(self.attribute_prefix, self.cdata_key).copy(node))
+            res.append(DictNode(self.attribute_prefix,
+                                self.cdata_key,
+                                self.always_aslist).copy(node))
             node = node.next_sibling(name)
         return res
 
@@ -47,7 +61,7 @@ def get_attributes(self, name):
             return None
         res = [attribute]
         attribute = attribute.next_attribute(name)
-        if attribute is None:
+        if attribute is None and not self.always_aslist:
             return res[0]
         while attribute is not None:
             res.append(attribute)
@@ -74,17 +88,23 @@ def __contains__(self, name):
         return True
 
     def __iter__(self):
-        return DictNodeIterator(self.children)
+        return DictNodeIterator(self.children,
+                                self.attribute_prefix,
+                                self.cdata_key,
+                                self.always_aslist)
 
 
 class RapidXml(DictNode, _rapidxml.Document):
     def __init__(self,
                  text="",
                  from_file=False,
                  attribute_prefix='@',
-                 cdata_key='#text'):
-        DictNode.__init__(self, attribute_prefix, cdata_key)
+                 cdata_key='#text',
+                 always_aslist=False):
+        DictNode.__init__(self, attribute_prefix, cdata_key, always_aslist)
         _rapidxml.Document.__init__(self, text, from_file)
 
     def allocate_node(self, *args):
-        return DictNode().copy(super(RapidXml, self).allocate_node(*args))
+        return DictNode(self.attribute_prefix,
+                        self.cdata_key,
+                        self.always_aslist).copy(super(RapidXml, self).allocate_node(*args))