Merge pull request #53 from dapper91/dev

- model parameters inheritance bug fixed. See #51

Author: dapper91

CHANGELOG.rst

@@ -2,6 +2,12 @@ Changelog
 =========
 
 
+0.6.1 (2023-04-15)
+------------------
+
+- model parameters inheritance bug fixed. See https://github.com/dapper91/pydantic-xml/issues/51
+
+
 0.6.0 (2023-02-05)
 ------------------
 

pydantic_xml/model.py

@@ -218,8 +218,8 @@ def __init_subclass__(
             tag: Optional[str] = None,
             ns: Optional[str] = None,
             nsmap: Optional[NsMap] = None,
-            ns_attrs: bool = False,
-            search_mode: SearchMode = SearchMode.STRICT,
+            ns_attrs: Optional[bool] = None,
+            search_mode: Optional[SearchMode] = None,
             **kwargs: Any,
     ):
         """
@@ -237,8 +237,9 @@ def __init_subclass__(
         cls.__xml_tag__ = tag if tag is not None else getattr(cls, '__xml_tag__', None)
         cls.__xml_ns__ = ns if ns is not None else getattr(cls, '__xml_ns__', None)
         cls.__xml_nsmap__ = nsmap if nsmap is not None else getattr(cls, '__xml_nsmap__', None)
-        cls.__xml_ns_attrs__ = ns_attrs if ns_attrs is not None else getattr(cls, '__xml_ns_attrs__', None)
-        cls.__xml_search_mode__ = search_mode if search_mode is not None else getattr(cls, '__xml_search_mode__', None)
+        cls.__xml_ns_attrs__ = ns_attrs if ns_attrs is not None else getattr(cls, '__xml_ns_attrs__', False)
+        cls.__xml_search_mode__ = search_mode if search_mode is not None \
+            else getattr(cls, '__xml_search_mode__', SearchMode.STRICT)
 
         default_xml_encoder: Callable[[Any], Any]
         if xml_encoders := getattr(cls.Config, 'xml_encoders', None):

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pydantic-xml"
-version = "0.6.0"
+version = "0.6.1"
 description = "pydantic xml extension"
 authors = ["Dmitry Pershin <dapper1291@gmail.com>"]
 license = "Unlicense"
@@ -45,7 +45,7 @@ mypy = "^0.971"
 pre-commit = "^2.20.0"
 pytest = "^7.1.2"
 pytest-cov = "^3.0.0"
-xmldiff = "^2.4"
+xmldiff = "2.5"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

tests/test_misc.py

@@ -163,3 +163,24 @@ class TestModel(BaseXmlModel, tag='model'):
     '''
     actual_xml = actual_obj.to_xml(skip_empty=True)
     assert_xml_equal(actual_xml, expected_xml.encode())
+
+
+def test_model_params_inheritance():
+    class BaseModel(
+        BaseXmlModel,
+        tag='TestTag',
+        ns='TestNamespace',
+        nsmap={'test': 'value'},
+        ns_attrs=True,
+        search_mode='ordered',
+    ):
+        pass
+
+    class TestModel(BaseModel):
+        pass
+
+    assert TestModel.__xml_tag__ == BaseModel.__xml_tag__
+    assert TestModel.__xml_ns__ == BaseModel.__xml_ns__
+    assert TestModel.__xml_nsmap__ == BaseModel.__xml_nsmap__
+    assert TestModel.__xml_ns_attrs__ == BaseModel.__xml_ns_attrs__
+    assert TestModel.__xml_search_mode__ == BaseModel.__xml_search_mode__