For #13673, fix for Python 3.11

gplsteph · gplsteph · commit bcc916bd1921 · 2024-04-25T16:44:58.000+02:00
diff --git a/framework.py b/framework.py
@@ -75,7 +75,7 @@ def init_framework(self):
                     "lib"
                 )
             )
-            python_pattern = r"^python%d\.\d$" % python_major
+            python_pattern = r"^python%d\.\d+$" % python_major
             for folder in lib_folders:
                 if re.match(python_pattern, folder):
                     break
diff --git a/hooks/core/bootstrap.py b/hooks/core/bootstrap.py
@@ -138,7 +138,7 @@ def populate_bundle_cache_entry(self, destination, descriptor, **kwargs):
             for asset in response_d["assets"]:
                 name = asset["name"]
                 m = re.match(
-                    r"%s-py\d.\d-%s.zip" % (version, pname),
+                    r"%s-py\d.\d+-%s.zip" % (version, pname),
                     name
                 )
                 if m:

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ def init_framework(self):`
`75`	`75`	`"lib"`
`76`	`76`	`)`
`77`	`77`	`)`
`78`		`- python_pattern = r"^python%d\.\d$" % python_major`
	`78`	`+ python_pattern = r"^python%d\.\d+$" % python_major`
`79`	`79`	`for folder in lib_folders:`
`80`	`80`	`if re.match(python_pattern, folder):`
`81`	`81`	`break`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ def populate_bundle_cache_entry(self, destination, descriptor, **kwargs):`
`138`	`138`	`for asset in response_d["assets"]:`
`139`	`139`	`name = asset["name"]`
`140`	`140`	`m = re.match(`
`141`		`- r"%s-py\d.\d-%s.zip" % (version, pname),`
	`141`	`+ r"%s-py\d.\d+-%s.zip" % (version, pname),`
`142`	`142`	`name`
`143`	`143`	`)`
`144`	`144`	`if m:`