Commit 3022ddbe authored by Godefroid Chapelle's avatar Godefroid Chapelle

Problem: normalizer and parser not ready for 3.10

Solution: enables more than one digit
parent e27cdac6
...@@ -581,7 +581,7 @@ else: ...@@ -581,7 +581,7 @@ else:
re.compile(r'(\n?)- \S+\.pyc\n'), '\\1') re.compile(r'(\n?)- \S+\.pyc\n'), '\\1')
normalize_egg_py = ( normalize_egg_py = (
re.compile(r'-py\d[.]\d(-\S+)?.egg'), re.compile(r'-py\d[.]\d+(-\S+)?.egg'),
'-pyN.N.egg', '-pyN.N.egg',
) )
......
...@@ -3479,7 +3479,7 @@ def buildout_txt_setup(test): ...@@ -3479,7 +3479,7 @@ def buildout_txt_setup(test):
os.path.join(eggs, 'zc.recipe.egg'), 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 ).match
def makeNewRelease(project, ws, dest, version='99.99'): def makeNewRelease(project, ws, dest, version='99.99'):
dist = ws.find(pkg_resources.Requirement.parse(project)) dist = ws.find(pkg_resources.Requirement.parse(project))
...@@ -3719,7 +3719,7 @@ def test_suite(): ...@@ -3719,7 +3719,7 @@ def test_suite():
optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS, optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
checker=renormalizing.RENormalizing([ checker=renormalizing.RENormalizing([
(re.compile(r'(zc.buildout|setuptools)-\d+[.]\d+\S*' (re.compile(r'(zc.buildout|setuptools)-\d+[.]\d+\S*'
r'-py\d.\d.egg'), r'-py\d.\d+.egg'),
'\\1.egg'), '\\1.egg'),
zc.buildout.testing.normalize_path, zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment