Skip to content

Commit 5733d46

Browse files
authored
Simplify combing SpecifierSet.prereleases (#1073)
1 parent 16cfaeb commit 5733d46

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/packaging/specifiers.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -922,11 +922,10 @@ def __and__(self, other: SpecifierSet | str) -> SpecifierSet:
922922
specifier = SpecifierSet()
923923
specifier._specs = frozenset(self._specs | other._specs)
924924

925-
if self._prereleases is None and other._prereleases is not None:
925+
# Combine prerelease settings: use common or non-None value
926+
if self._prereleases is None or self._prereleases == other._prereleases:
926927
specifier._prereleases = other._prereleases
927-
elif (
928-
self._prereleases is not None and other._prereleases is None
929-
) or self._prereleases == other._prereleases:
928+
elif other._prereleases is None:
930929
specifier._prereleases = self._prereleases
931930
else:
932931
raise ValueError(

0 commit comments

Comments
 (0)