Use a list instead of a tuple for accepted types

Author: mvantellingen

src/zeep/xsd/elements/any.py

@@ -196,17 +196,17 @@ def _validate_item(self, value, render_path):
         # Check if we received a proper value object. If we receive the wrong
         # type then return a nice error message
         if self.restrict:
-            expected_types = (etree._Element, dict) + self.restrict.accepted_types
+            expected_types = [etree._Element, dict] + self.restrict.accepted_types
         else:
-            expected_types = (etree._Element, dict, AnyObject)
+            expected_types = [etree._Element, dict, AnyObject]
 
         if value in (None, NotSet):
             if not self.is_optional:
                 raise exceptions.ValidationError(
                     "Missing element %s" % (self.name), path=render_path
                 )
 
-        elif not isinstance(value, expected_types):
+        elif not isinstance(value, tuple(expected_types)):
             type_names = ["%s.%s" % (t.__module__, t.__name__) for t in expected_types]
             err_message = "Any element received object of type %r, expected %s" % (
                 type(value).__name__,

src/zeep/xsd/types/any.py

@@ -88,13 +88,13 @@ def parse_xmlelement(
                 )
 
                 if xmlelement.text:
-                    return xmlelement.text
+                    return self.pythonvalue(xmlelement.text)
                 return children
 
             # If the xsd_type is xsd:anyType then we will recurs so ignore
             # that.
             if isinstance(xsd_type, self.__class__):
-                return xmlelement.text or None
+                return self.pythonvalue(xmlelement.text) or None
 
             return xsd_type.parse_xmlelement(xmlelement, schema, context=context)
 
@@ -125,12 +125,12 @@ def xmlvalue(self, value):
             builtins.Time,
         ]
         for xsd_type in available_types:
-            if isinstance(value, xsd_type.accepted_types):  # type: ignore
+            if isinstance(value, tuple(xsd_type.accepted_types)):
                 return xsd_type().xmlvalue(value)
         return str(value)
 
-    def pythonvalue(self, value, schema=None):
-        return value
+    def pythonvalue(self, value, schema=None) -> typing.Optional[str]:
+        return value if value is not None else None
 
     def signature(self, schema=None, standalone=True):
         return "xsd:anyType"

src/zeep/xsd/types/base.py

@@ -27,8 +27,8 @@ def accept(self, value):
         raise NotImplementedError
 
     @property
-    def accepted_types(self):
-        return tuple()
+    def accepted_types(self) -> typing.List[typing.Type]:
+        return []
 
     def validate(self, value, required=False):
         return

src/zeep/xsd/types/builtins.py

@@ -38,7 +38,7 @@ def _wrapper(self, value):
 # Primitive types
 class String(BuiltinType):
     _default_qname = xsd_ns("string")
-    accepted_types = (str,)
+    accepted_types = [str]
 
     @check_no_collection
     def xmlvalue(self, value):
@@ -52,7 +52,7 @@ def pythonvalue(self, value):
 
 class Boolean(BuiltinType):
     _default_qname = xsd_ns("boolean")
-    accepted_types = (bool,)
+    accepted_types = [bool]
 
     @check_no_collection
     def xmlvalue(self, value):
@@ -68,7 +68,7 @@ def pythonvalue(self, value):
 
 class Decimal(BuiltinType):
     _default_qname = xsd_ns("decimal")
-    accepted_types = (_Decimal, float, str)
+    accepted_types = [_Decimal, float, str]
 
     @check_no_collection
     def xmlvalue(self, value):
@@ -80,7 +80,7 @@ def pythonvalue(self, value):
 
 class Float(BuiltinType):
     _default_qname = xsd_ns("float")
-    accepted_types = (float, _Decimal, str)
+    accepted_types = [float, _Decimal, str]
 
     def xmlvalue(self, value):
         return str(value).upper()
@@ -91,7 +91,7 @@ def pythonvalue(self, value):
 
 class Double(BuiltinType):
     _default_qname = xsd_ns("double")
-    accepted_types = (_Decimal, float, str)
+    accepted_types = [_Decimal, float, str]
 
     @check_no_collection
     def xmlvalue(self, value):
@@ -103,7 +103,7 @@ def pythonvalue(self, value):
 
 class Duration(BuiltinType):
     _default_qname = xsd_ns("duration")
-    accepted_types = (isodate.duration.Duration, str)
+    accepted_types = [isodate.duration.Duration, str]
 
     @check_no_collection
     def xmlvalue(self, value):
@@ -120,7 +120,7 @@ def pythonvalue(self, value):
 
 class DateTime(BuiltinType):
     _default_qname = xsd_ns("dateTime")
-    accepted_types = (datetime.datetime, str)
+    accepted_types = [datetime.datetime, str]
 
     @check_no_collection
     def xmlvalue(self, value):
@@ -155,7 +155,7 @@ def pythonvalue(self, value):
 
 class Time(BuiltinType):
     _default_qname = xsd_ns("time")
-    accepted_types = (datetime.time, str)
+    accepted_types = [datetime.time, str]
 
     @check_no_collection
     def xmlvalue(self, value):
@@ -172,7 +172,7 @@ def pythonvalue(self, value):
 
 class Date(BuiltinType):
     _default_qname = xsd_ns("date")
-    accepted_types = (datetime.date, str)
+    accepted_types = [datetime.date, str]
 
     @check_no_collection
     def xmlvalue(self, value):
@@ -192,7 +192,7 @@ class gYearMonth(BuiltinType):
 
     """
 
-    accepted_types = (datetime.date, str)
+    accepted_types = [datetime.date, str]
     _default_qname = xsd_ns("gYearMonth")
     _pattern = re.compile(
         r"^(?P<year>-?\d{4,})-(?P<month>\d\d)(?P<timezone>Z|[-+]\d\d:?\d\d)?$"
@@ -222,7 +222,7 @@ class gYear(BuiltinType):
 
     """
 
-    accepted_types = (datetime.date, str)
+    accepted_types = [datetime.date, str]
     _default_qname = xsd_ns("gYear")
     _pattern = re.compile(r"^(?P<year>-?\d{4,})(?P<timezone>Z|[-+]\d\d:?\d\d)?$")
 
@@ -247,7 +247,7 @@ class gMonthDay(BuiltinType):
 
     """
 
-    accepted_types = (datetime.date, str)
+    accepted_types = [datetime.date, str]
     _default_qname = xsd_ns("gMonthDay")
     _pattern = re.compile(
         r"^--(?P<month>\d\d)-(?P<day>\d\d)(?P<timezone>Z|[-+]\d\d:?\d\d)?$"
@@ -279,7 +279,7 @@ class gDay(BuiltinType):
 
     """
 
-    accepted_types = (datetime.date, str)
+    accepted_types = [datetime.date, str]
     _default_qname = xsd_ns("gDay")
     _pattern = re.compile(r"^---(?P<day>\d\d)(?P<timezone>Z|[-+]\d\d:?\d\d)?$")
 
@@ -303,7 +303,7 @@ class gMonth(BuiltinType):
 
     """
 
-    accepted_types = (datetime.date, str)
+    accepted_types = [datetime.date, str]
     _default_qname = xsd_ns("gMonth")
     _pattern = re.compile(r"^--(?P<month>\d\d)(?P<timezone>Z|[-+]\d\d:?\d\d)?$")
 
@@ -321,7 +321,7 @@ def pythonvalue(self, value):
 
 
 class HexBinary(BuiltinType):
-    accepted_types = (str,)
+    accepted_types = [str]
     _default_qname = xsd_ns("hexBinary")
 
     @check_no_collection
@@ -333,7 +333,7 @@ def pythonvalue(self, value):
 
 
 class Base64Binary(BuiltinType):
-    accepted_types = (str,)
+    accepted_types = [str]
     _default_qname = xsd_ns("base64Binary")
 
     @check_no_collection
@@ -345,7 +345,7 @@ def pythonvalue(self, value):
 
 
 class AnyURI(BuiltinType):
-    accepted_types = (str,)
+    accepted_types = [str]
     _default_qname = xsd_ns("anyURI")
 
     @check_no_collection
@@ -357,7 +357,7 @@ def pythonvalue(self, value):
 
 
 class QName(BuiltinType):
-    accepted_types = (str,)
+    accepted_types = [str]
     _default_qname = xsd_ns("QName")
 
     @check_no_collection
@@ -369,7 +369,7 @@ def pythonvalue(self, value):
 
 
 class Notation(BuiltinType):
-    accepted_types = (str,)
+    accepted_types = [str]
     _default_qname = xsd_ns("NOTATION")
 
 
@@ -427,7 +427,7 @@ class Entities(Entity):
 
 class Integer(Decimal):
     _default_qname = xsd_ns("integer")
-    accepted_types = (int, float, str)  # type: ignore
+    accepted_types = [int, float, str]
 
     def xmlvalue(self, value):
         return str(value)

src/zeep/xsd/types/collection.py

@@ -85,7 +85,7 @@ def parse_xmlelement(
             return self.item_class().parse_xmlelement(
                 xmlelement, schema, allow_none, context
             )
-        return xmlelement.text
+        return str(xmlelement.text) or None
 
     def pythonvalue(self, value):
         if self.item_class:

src/zeep/xsd/types/complex.py

@@ -54,7 +54,7 @@ def __init__(
         self._attributes = attributes or []
         self._restriction = restriction
         self._extension = extension
-        self._extension_types = tuple()
+        self._extension_types: typing.List[typing.Type] = []
         super().__init__(qname=qname, is_global=is_global)
 
     def __call__(self, *args, **kwargs):
@@ -63,8 +63,8 @@ def __call__(self, *args, **kwargs):
         return self._value_class(*args, **kwargs)
 
     @property
-    def accepted_types(self) -> typing.Tuple[typing.Type]:
-        return (self._value_class,) + self._extension_types
+    def accepted_types(self) -> typing.List[typing.Type]:
+        return [self._value_class] + self._extension_types
 
     @threaded_cached_property
     def _array_class(self) -> typing.Type[ArrayValue]:
@@ -269,7 +269,7 @@ def render(
 
         if (
             len(self.elements_nested) == 1
-            and isinstance(value, self.accepted_types)
+            and isinstance(value, tuple(self.accepted_types))
             and not isinstance(value, (list, dict, CompoundValue))
         ):
             element = self.elements_nested[0][1]