Problem: normalizer and parser not ready for 3.10

Solution: enables more than one digit
buildout · Mar 4, 2021 · 3022ddb · 3022ddb
1 parent e27cdac
commit 3022ddb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/zc/buildout/testing.py b/src/zc/buildout/testing.py
@@ -581,7 +581,7 @@ def _normalize_path(match):
         re.compile(r'(\n?)-  \S+\.pyc\n'), '\\1')
 
 normalize_egg_py = (
-    re.compile(r'-py\d[.]\d(-\S+)?.egg'),
+    re.compile(r'-py\d[.]\d+(-\S+)?.egg'),
     '-pyN.N.egg',
     )
 

diff --git a/src/zc/buildout/tests.py b/src/zc/buildout/tests.py
@@ -3479,7 +3479,7 @@ def buildout_txt_setup(test):
         os.path.join(eggs, 'zc.recipe.egg'),
         )
 
-egg_parse = re.compile(r'([0-9a-zA-Z_.]+)-([0-9a-zA-Z_.]+)-py(\d[.]\d)$'
+egg_parse = re.compile(r'([0-9a-zA-Z_.]+)-([0-9a-zA-Z_.]+)-py(\d[.]\d+)$'
                        ).match
 def makeNewRelease(project, ws, dest, version='99.99'):
     dist = ws.find(pkg_resources.Requirement.parse(project))
@@ -3719,7 +3719,7 @@ def test_suite():
             optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
             checker=renormalizing.RENormalizing([
                 (re.compile(r'(zc.buildout|setuptools)-\d+[.]\d+\S*'
-                            r'-py\d.\d.egg'),
+                            r'-py\d.\d+.egg'),
                  '\\1.egg'),
                 zc.buildout.testing.normalize_path,
                 zc.buildout.testing.normalize_endings,