Merge pull request #132 from dapper91/dev

- root model default value bug fixed.
- python 3.12 support added.

Author: dapper91

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

CHANGELOG.rst

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+2.2.4 (2023-10-06)
+------------------
+
+- root model default value bug fixed.
+- python 3.12 support added.
+
+
 2.2.3 (2023-09-20)
 ------------------
 

docs/source/pages/data-binding/unions.rst

@@ -7,12 +7,19 @@ ___________
 To declare a field that can be of one type or anther :py:obj:`typing.Union` is used.
 It works for primitive types and models as well but not combined together.
 
+The type declaration order matters.
+Currently, `pydantic` has two validation modes:
+
+- 'left_to_right', where the first successful validation is accepted,
+- 'smart' (default), the first type that matches (without coercion) wins.
+
+You can read more about it in the
+`pydantic docs <https://docs.pydantic.dev/latest/api/standard_library_types/#union>`_.
 
 Primitive types
 ***************
 
-Union can be applied to text, attributes or elements. The type declaration order matters
-since the first type matched wins.
+Union can be applied to text, attributes or elements.
 
 .. grid:: 2
     :gutter: 2
@@ -48,9 +55,7 @@ since the first type matched wins.
 Model types
 ***********
 
-Union can be applied to model types either. The type declaration order matters
-since the first model matched wins.
-
+Union can be applied to model types either.
 
 .. grid:: 2
     :gutter: 2

pydantic_xml/serializers/factories/model.py

@@ -267,7 +267,8 @@ def deserialize(
         if element is None:
             return None
 
-        result = self._root_serializer.deserialize(element, context=context)
+        if (result := self._root_serializer.deserialize(element, context=context)) is None:
+            result = pdc.PydanticUndefined
 
         if self._model.model_config.get('extra', 'ignore') == 'forbid':
             self._check_extra(self._model.__name__, element)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pydantic-xml"
-version = "2.2.3"
+version = "2.2.4"
 description = "pydantic xml extension"
 authors = ["Dmitry Pershin <dapper1291@gmail.com>"]
 license = "Unlicense"
@@ -16,14 +16,19 @@ classifiers = [
     "Intended Audience :: Developers",
     "Natural Language :: English",
     "License :: Public Domain",
+    "Operating System :: OS Independent",
     "Topic :: Software Development :: Libraries",
+    "Topic :: Text Processing :: Markup :: XML",
     'Framework :: Pydantic',
-    'Framework :: Pydantic :: 2',
+    "Framework :: Pydantic :: 1",
+    "Framework :: Pydantic :: 2",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Typing :: Typed",
 ]
 
 [tool.poetry.dependencies]

tests/test_primitives.py

@@ -193,3 +193,27 @@ class TestModel(RootXmlModel, tag='model'):
 
     actual_xml = actual_obj.to_xml()
     assert_xml_equal(actual_xml, xml)
+
+
+def test_root_model_default():
+    class TestRootModel(RootXmlModel, tag='sub'):
+        root: int = 1
+
+    class TestModel(BaseXmlModel, tag='model'):
+        sub: TestRootModel
+
+    xml = '''
+    <model><sub></sub></model>
+    '''
+
+    actual_obj = TestModel.from_xml(xml)
+    expected_obj = TestModel(sub=TestRootModel(1))
+
+    assert actual_obj == expected_obj
+
+    actual_xml = actual_obj.to_xml()
+
+    expected_xml = '''
+    <model><sub>1</sub></model>
+    '''
+    assert_xml_equal(actual_xml, expected_xml)