Merge pull request #5671 from DIRACGridBot/cherry-pick-2-4b6965691-integration

fstagni · web-flow · commit fb223dfe193f · 2021-12-01T11:27:50.000+01:00
[sweep:integration] Fix DIRAC.isPy3VersionNumber always returns True
diff --git a/src/DIRAC/__init__.py b/src/DIRAC/__init__.py
@@ -109,7 +109,7 @@ def isPy3VersionNumber(releaseVersion):
     return (
         re.match(
             r"^([1-9][0-9]*!)?(0|[1-9][0-9]*)(\.(0|[1-9][0-9]*))*((a|b|rc)(0|[1-9][0-9]*))?(\.post(0|[1-9][0-9]*))?(\.dev(0|[1-9][0-9]*))?$",
-            version,
+            releaseVersion,
         )
         is not None
     )

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ def isPy3VersionNumber(releaseVersion):`
`109`	`109`	`return (`
`110`	`110`	`re.match(`
`111`	`111`	`r"^([1-9][0-9]!)?(0\|[1-9][0-9])(\.(0\|[1-9][0-9]))((a\|b\|rc)(0\|[1-9][0-9]))?(\.post(0\|[1-9][0-9]))?(\.dev(0\|[1-9][0-9]*))?$",`
`112`		`- version,`
	`112`	`+ releaseVersion,`
`113`	`113`	`)`
`114`	`114`	`is not None`
`115`	`115`	`)`