fix endless recursion in intersection and union of multiconstraints (#…

…593) (cherry picked from commit 73dd45a)
python-poetry · May 20, 2023 · bf6c63f · bf6c63f
1 parent 0b4c8c7
commit bf6c63f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/poetry/core/constraints/generic/multi_constraint.py b/src/poetry/core/constraints/generic/multi_constraint.py
@@ -74,6 +74,13 @@ def invert(self) -> UnionConstraint:
         return UnionConstraint(*(c.invert() for c in self._constraints))
 
     def intersect(self, other: BaseConstraint) -> BaseConstraint:
+        if isinstance(other, MultiConstraint):
+            ours = set(self.constraints)
+            union = list(self.constraints) + [
+                c for c in other.constraints if c not in ours
+            ]
+            return MultiConstraint(*union)
+
         if not isinstance(other, Constraint):
             return other.intersect(self)
 
@@ -90,6 +97,11 @@ def intersect(self, other: BaseConstraint) -> BaseConstraint:
         return MultiConstraint(*self._constraints, other)
 
     def union(self, other: BaseConstraint) -> BaseConstraint:
+        if isinstance(other, MultiConstraint):
+            theirs = set(other.constraints)
+            common = [c for c in self.constraints if c in theirs]
+            return MultiConstraint(*common)
+
         if not isinstance(other, Constraint):
             return other.union(self)
 

diff --git a/tests/constraints/generic/test_constraint.py b/tests/constraints/generic/test_constraint.py
@@ -219,6 +219,15 @@ def test_invert(constraint: BaseConstraint, inverted: BaseConstraint) -> None:
             MultiConstraint(Constraint("win32", "!="), Constraint("linux", "!=")),
             EmptyConstraint(),
         ),
+        (
+            MultiConstraint(Constraint("win32", "!="), Constraint("linux", "!=")),
+            MultiConstraint(Constraint("win32", "!="), Constraint("darwin", "!=")),
+            MultiConstraint(
+                Constraint("win32", "!="),
+                Constraint("linux", "!="),
+                Constraint("darwin", "!="),
+            ),
+        ),
     ],
 )
 def test_intersect(
@@ -393,6 +402,11 @@ def test_intersect(
                 MultiConstraint(Constraint("win32", "!="), Constraint("linux", "!=")),
             ),
         ),
+        (
+            MultiConstraint(Constraint("win32", "!="), Constraint("linux", "!=")),
+            MultiConstraint(Constraint("win32", "!="), Constraint("darwin", "!=")),
+            MultiConstraint(Constraint("win32", "!=")),
+        ),
     ],
 )
 def test_union(