XmlData now supports (non-)serialization of AnyXml type

plq · plq · commit b5a242b2d12b · 2022-01-31T07:40:42.000+03:00
diff --git a/examples/xml/utils.py b/examples/xml/utils.py
@@ -31,6 +31,7 @@
 
 
 import logging
+
 logging.basicConfig(level=logging.DEBUG)
 
 import uuid
@@ -39,16 +40,10 @@
 from pprint import pprint
 
 from lxml import etree
+from lxml.builder import E
 
-from spyne.model.primitive import Uuid
-from spyne.model.primitive import Unicode
-from spyne.model.primitive import String
-from spyne.model.primitive import Integer
-from spyne.model.primitive import Decimal
-from spyne.model.primitive import DateTime
-from spyne.model.complex import XmlData
-from spyne.model.complex import ComplexModel
-from spyne.model.complex import XmlAttribute
+from spyne import AnyXml, Uuid, Unicode, String, Integer, Decimal, DateTime, \
+    XmlData, ComplexModel, XmlAttribute
 
 from spyne.util.xml import get_schema_documents
 from spyne.util.xml import get_object_as_xml
@@ -85,6 +80,7 @@ class ProductEdition(ComplexModel):
 
     id = XmlAttribute(Uuid)
     name = XmlData(Unicode)
+    addtl = XmlData(AnyXml)
 
 
 class Product(ComplexModel):
@@ -129,11 +125,14 @@ class Product(ComplexModel):
 print(get_xml_as_object(doc, Foo))
 print()
 
+# could be anything, really
+elt = E.tag(E.subtag("subdata"))
+
 # XmlData example.
 print("Product output (illustrates XmlData):")
 product = Product(
     id=uuid.uuid4(),
-    edition=ProductEdition(id=uuid.uuid4(), name='My edition')
+    edition=ProductEdition(id=uuid.uuid4(), name='My edition', addtl=elt)
 )
 
 print()
diff --git a/spyne/model/complex.py b/spyne/model/complex.py
@@ -43,6 +43,7 @@
 from spyne.model import Point, Unicode, PushBase, ModelBase
 from spyne.model._base import PSSM_VALUES, apply_pssm
 from spyne.model.primitive import NATIVE_MAP
+from spyne.model.primitive._base import AnyXml
 
 from spyne.util import six, memoize, memoize_id, sanitize_args, \
     memoize_ignore_none
@@ -143,10 +144,13 @@ class XmlData(XmlModifier):
     @classmethod
     def marshall(cls, prot, name, value, parent_elt):
         if value is not None:
-            if len(parent_elt) == 0:
-                parent_elt.text = prot.to_bytes(cls.type, value)
+            if issubclass(cls.type, AnyXml):
+                parent_elt.append(value)
             else:
-                parent_elt[-1].tail = prot.to_bytes(cls.type, value)
+                if len(parent_elt) == 0:
+                    parent_elt.text = prot.to_bytes(cls.type, value)
+                else:
+                    parent_elt[-1].tail = prot.to_bytes(cls.type, value)
 
     @classmethod
     def get_type_name(cls):
diff --git a/spyne/protocol/cloth/to_parent.py b/spyne/protocol/cloth/to_parent.py
@@ -423,9 +423,12 @@ def _write_members(self, ctx, cls, inst, parent, use_ns=None, **kwargs):
             sub_name = self._gen_sub_name(cls, attr, k, use_ns)
 
             if issubclass(v, XmlData):
-                subvalstr = self.to_unicode(v.type, subvalue)
-                if subvalstr is not None:
-                    parent.write(subvalstr)
+                if issubclass(v.type, AnyXml):
+                    parent.write(subvalue)
+                else:
+                    subvalstr = self.to_unicode(v.type, subvalue)
+                    if subvalstr is not None:
+                        parent.write(subvalstr)
                 continue
 
             if subvalue is not None or attr.min_occurs > 0:
