Merge pull request #84 from seanmil/multoccurrence

Support multiple occurrence of a XML node

AUTHORS.md

@@ -40,3 +40,4 @@ Patches and Suggestions
 - jpc <jpc@alumni.rice.edu>
 - Luka Birsa
 - Bill Bennert @billwebreply
+- Sean E. Millichamp

pysimplesoap/simplexml.py

@@ -385,7 +385,9 @@ def unmarshall(self, types, strict=True):
             if isinstance(fn, list):
                 # append to existing list (if any) - unnested dict arrays -
                 value = d.setdefault(name, [])
-                children = node.children()
+                # If the node has no children then the node itself might
+                # have multiple occurrences:
+                children = node.children() or node
                 # TODO: check if this was really needed (get first child only)
                 ##if len(fn[0]) == 1 and children:
                 ##    children = children()

tests/simplexmlelement_test.py

@@ -141,6 +141,29 @@ def test_tuple_unmarshall(self):
             )}}
         self.eq(span.unmarshall(d), e)
 
+    def test_multiple_element_unmarshall_one(self):
+        xml = """
+        <results>
+            <foo>bar</foo>
+        </results>
+        """
+        span = SimpleXMLElement(xml)
+        d = {'results': {'foo': [str]}}
+        e = {'results': {'foo': ['bar']}}
+        self.eq(span.unmarshall(d), e)
+
+    def test_multiple_element_unmarshall_two(self):
+        xml = """
+        <results>
+            <foo>bar</foo>
+            <foo>baz</foo>
+        </results>
+        """
+        span = SimpleXMLElement(xml)
+        d = {'results': {'foo': [str]}}
+        e = {'results': {'foo': ['bar', 'baz']}}
+        self.eq(span.unmarshall(d), e)
+
     def test_basic(self):
         span = SimpleXMLElement(
             '<span><a href="python.org.ar">pyar</a>'