From 5117696547960d9cd86a676dab8997d43f12d70a Mon Sep 17 00:00:00 2001 From: Mark Pryor Date: Mon, 1 Jan 2024 13:25:52 -0800 Subject: [PATCH 2/2] fix match/case for py39 - pt2 --- cargo2rpm/semver.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cargo2rpm/semver.py b/cargo2rpm/semver.py index 337efdc..809d300 100644 --- a/cargo2rpm/semver.py +++ b/cargo2rpm/semver.py @@ -444,7 +444,7 @@ class Comparator: else: comparators.append(Comparator(Op.LESS_EQ, self.major, self.minor, self.patch, self.pre)) - elif self.op == "Op.TILDE" : + elif self.op == Op.TILDE : # 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()) @@ -456,7 +456,7 @@ class Comparator: else: # pragma nocover raise ValueError(f"Unknown operator: {self.op} (this should never happen)") - elif self.op == "Op.CARET" : + elif self.op == Op.CARET : # 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()) @@ -475,7 +475,7 @@ class Comparator: else: # pragma nocover raise ValueError(f"Unknown operator: {self.op} (this should never happen)") - elif self.op == "Op.WILDCARD" : + 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()) @@ -516,15 +516,15 @@ class Comparator: pre_str_less = f"~{pre}" # match self.op: - if self.op == "Op.EXACT" : + if self.op == Op.EXACT : return f"crate({crate}{feature_str}) = {version_str}{pre_str}" - elif self.op == "Op.GREATER" : + elif self.op == Op.GREATER : return f"crate({crate}{feature_str}) > {version_str}{pre_str}" - elif self.op == "Op.GREATER_EQ" : + elif self.op == Op.GREATER_EQ : return f"crate({crate}{feature_str}) >= {version_str}{pre_str}" - elif self.op == "Op.LESS" : + elif self.op == Op.LESS : return f"crate({crate}{feature_str}) < {version_str}{pre_str_less}" - elif self.op == "Op.LESS_EQ" : + elif self.op == Op.LESS_EQ : return f"crate({crate}{feature_str}) <= {version_str}{pre_str}" else: # pragma nocover raise ValueError(f"Unsupported operator for RPM syntax formatting: {self.op}") -- 2.39.3