From 45633669b98fc0a7bac50ebac12b812cb584a6c3 Mon Sep 17 00:00:00 2001 From: Mark Pryor Date: Mon, 1 Jan 2024 14:11:27 -0800 Subject: [PATCH] fix match/case for py39 - pt3 --- cargo2rpm/semver.py | 46 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/cargo2rpm/semver.py b/cargo2rpm/semver.py index 50dbc2d..d5502ed 100644 --- a/cargo2rpm/semver.py +++ b/cargo2rpm/semver.py @@ -459,39 +459,35 @@ class Comparator: # match (self.minor, self.patch): if self.minor is None and self.patch is None: comparators.extend(Comparator(Op.EXACT, self.major, None, None, None).normalize()) - elif self.minor=="minor" and self.patch is None: - comparators.extend(Comparator(Op.EXACT, self.major, minor, None, None).normalize()) - elif self.minor=="minor" and self.patch=="patch" : - comparators.append(Comparator(Op.GREATER_EQ, self.major, minor, patch, self.pre)) - comparators.append(Comparator(Op.LESS, self.major, minor + 1, 0, None)) - else: # pragma nocover - raise ValueError(f"Unknown operator: {self.op} (this should never happen)") - - elif self.op == Op.CARET : + elif self.patch is None: + comparators.extend(Comparator(Op.EXACT, self.major, self.minor, None, None).normalize()) + else: + comparators.append(Comparator(Op.GREATER_EQ, self.major, self.minor, self.patch, self.pre)) + comparators.append(Comparator(Op.LESS, self.major, self.minor + 1, 0, None)) + # match (self.major, self.minor, self.patch): case (major, None, None) - if self.major=="major" and self.minor is None and self.patch is None: - comparators.extend(Comparator(Op.EXACT, major, None, None, None).normalize()) + elif self.op == Op.CARET: + if self.minor is None and self.patch is None: + comparators.extend(Comparator(Op.EXACT, self.major, None, None, None).normalize()) elif self.major==0 and self.minor==0 and self.patch is None: comparators.extend(Comparator(Op.EXACT, 0, 0, None, None).normalize()) - elif self.major=="major" and self.minor=="minor" and self.patch is None: - comparators.extend(Comparator(Op.CARET, major, minor, 0, None).normalize()) - elif self.major==0 and self.minor==0 and self.patch=="patch": - comparators.extend(Comparator(Op.EXACT, 0, 0, patch, self.pre).normalize()) - elif self.major==0 and self.minor=="minor" and self.patch=="patch": - comparators.append(Comparator(Op.GREATER_EQ, 0, minor, patch, self.pre)) - comparators.append(Comparator(Op.LESS, 0, minor + 1, 0, None)) - elif self.major=="major" and self.minor=="minor" and self.patch=="patch": - comparators.append(Comparator(Op.GREATER_EQ, major, minor, patch, self.pre)) - comparators.append(Comparator(Op.LESS, major + 1, 0, 0, None)) - else: # pragma nocover - raise ValueError(f"Unknown operator: {self.op} (this should never happen)") + elif self.patch is None: + comparators.extend(Comparator(Op.CARET, self.major, self.minor, 0, None).normalize()) + elif self.major == 0 and self.minor == 0: + comparators.extend(Comparator(Op.EXACT, 0, 0, self.patch, self.pre).normalize()) + elif self.major == 0: + comparators.append(Comparator(Op.GREATER_EQ, 0, self.minor, self.patch, self.pre)) + comparators.append(Comparator(Op.LESS, 0, self.minor + 1, 0, None)) + else: + comparators.append(Comparator(Op.GREATER_EQ, self.major, self.minor, self.patch, self.pre)) + comparators.append(Comparator(Op.LESS, self.major + 1, 0, 0, None)) elif self.op == Op.WILDCARD : # match (self.minor, self.patch): if self.minor is None and self.patch is None : comparators.extend(Comparator(Op.EXACT, self.major, None, None, None).normalize()) - elif self.minor=="minor" and self.patch is None : - comparators.extend(Comparator(Op.EXACT, self.major, minor, None, None).normalize()) + elif self.patch is None: + comparators.extend(Comparator(Op.EXACT, self.major, self.minor, None, None).normalize()) else: # pragma nocover raise ValueError(f"Unknown operator: {self.op} (this should never happen)") -- 2.39.3