From 9a79433af7e66ee5c1f721a1803dad4873666e62 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 9 Nov 2017 19:30:56 -0500 Subject: Use named groups in the pattern --- setuptools/command/bdist_egg.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'setuptools/command') diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py index f52c40d1..14dd97d3 100644 --- a/setuptools/command/bdist_egg.py +++ b/setuptools/command/bdist_egg.py @@ -239,7 +239,6 @@ class bdist_egg(Command): def zap_pyfiles(self): log.info("Removing .py files from temporary directory") - re_pycache_file = re.compile('(.+)\.cpython-3\d(.pyc)$') for base, dirs, files in walk_egg(self.bdist_dir): for name in files: if name.endswith('.py'): @@ -250,8 +249,9 @@ class bdist_egg(Command): if base.endswith('__pycache__'): path_old = os.path.join(base, name) - m = re_pycache_file.match(name) - path_new = os.path.join(base, os.pardir, m.group(1) + m.group(2)) + pattern = r'(?P.+)\.(?P[^.]+)\.pyc' + m = re.match(pattern, name) + path_new = os.path.join(base, os.pardir, m.group('name') + '.pyc') log.info("Renaming file from [%s] to [%s]" % (path_old, path_new)) if os.path.exists(path_new): os.unlink(path_new) -- cgit v1.2.3