Guard against multiple substitution group runs

tefra · Jun 23, 2021 · 5361381 · 5361381
1 parent e83e202
commit 5361381
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/tests/codegen/handlers/test_attribute_substitution.py b/tests/codegen/handlers/test_attribute_substitution.py
@@ -58,6 +58,10 @@ def test_process_attribute(self, mock_find):
 
         self.assertEqual(4, len(target.attrs))
 
+        # Guard against multiple runs in case of xs:groups
+        self.processor.process_attribute(target, first_attr)
+        self.assertEqual(4, len(target.attrs))
+
         self.assertEqual(reference_attrs[0], target.attrs[0])
         self.assertIsNot(reference_attrs[0], target.attrs[0])
         self.assertEqual(reference_attrs[1], target.attrs[3])

diff --git a/xsdata/codegen/handlers/attribute_substitution.py b/xsdata/codegen/handlers/attribute_substitution.py
@@ -15,7 +15,7 @@
 class AttributeSubstitutionHandler(RelativeHandlerInterface):
     """Apply substitution attributes to the given class recursively."""
 
-    __slots__ = ("substitutions",)
+    __slots__ = "substitutions"
 
     def __init__(self, container: ContainerInterface):
         super().__init__(container)
@@ -43,11 +43,17 @@ def process_attribute(self, target: Class, attr: Attr):
 
         The cloned attributes are placed below the attribute the are
         supposed to substitute.
+
+        Guard against multiple substitutions in case of xs:groups.
         """
         index = target.attrs.index(attr)
         assert self.substitutions is not None
 
         for attr_type in attr.types:
+            if attr_type.substituted:
+                continue
+
+            attr_type.substituted = True
             for substitution in self.substitutions.get(attr_type.qname, []):
                 clone = ClassUtils.clone_attribute(substitution, attr.restrictions)
 

diff --git a/xsdata/codegen/models.py b/xsdata/codegen/models.py
@@ -190,6 +190,7 @@ class AttrType:
     :param native:
     :param forward:
     :param circular:
+    :param substituted:
     """
 
     qname: str
@@ -198,6 +199,7 @@ class AttrType:
     native: bool = field(default=False)
     forward: bool = field(default=False)
     circular: bool = field(default=False)
+    substituted: bool = field(default=False, compare=False)
 
     @property
     def datatype(self) -> Optional[DataType]: