an empty multimarker is AnyMarker, not EmptyMarker

python-poetry · Nov 29, 2022 · 6530ced · 6530ced
1 parent d98aa6e
commit 6530ced
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/poetry/core/version/markers.py b/src/poetry/core/version/markers.py
@@ -435,9 +435,12 @@ def of(cls, *markers: BaseMarker) -> BaseMarker:
 
                 new_markers.append(marker)
 
-        if any(m.is_empty() for m in new_markers) or not new_markers:
+        if any(m.is_empty() for m in new_markers):
             return EmptyMarker()
 
+        if not new_markers:
+            return AnyMarker()
+
         if len(new_markers) == 1:
             return new_markers[0]
 
@@ -577,6 +580,9 @@ def only(self, *marker_names: str) -> BaseMarker:
             if not marker.is_empty():
                 new_markers.append(marker)
 
+        if not new_markers:
+            return EmptyMarker()
+
         return self.of(*new_markers)
 
     def invert(self) -> BaseMarker:

diff --git a/tests/version/test_markers.py b/tests/version/test_markers.py
@@ -933,6 +933,7 @@ def test_without_extras(marker: str, expected: str) -> None:
     [
         ('python_version >= "3.6"', "implementation_name", 'python_version >= "3.6"'),
         ('python_version >= "3.6"', "python_version", "*"),
+        ('python_version >= "3.6" and python_version < "3.11"', "python_version", "*"),
         (
             'python_version >= "3.6" and extra == "foo"',
             "extra",