Commit 0830232c authored by Jason R. Coombs's avatar Jason R. Coombs

Unconditionally rename __pycache__ files if they exist.

parent ee33fa23
...@@ -239,7 +239,6 @@ class bdist_egg(Command): ...@@ -239,7 +239,6 @@ class bdist_egg(Command):
def zap_pyfiles(self): def zap_pyfiles(self):
log.info("Removing .py files from temporary directory") log.info("Removing .py files from temporary directory")
py3 = sys.version_info >= (3, 0)
re_pycache_file = re.compile('(.+)\.cpython-3\d(.pyc)$') re_pycache_file = re.compile('(.+)\.cpython-3\d(.pyc)$')
for base, dirs, files in walk_egg(self.bdist_dir): for base, dirs, files in walk_egg(self.bdist_dir):
for name in files: for name in files:
...@@ -248,12 +247,12 @@ class bdist_egg(Command): ...@@ -248,12 +247,12 @@ class bdist_egg(Command):
log.debug("Deleting %s", path) log.debug("Deleting %s", path)
os.unlink(path) os.unlink(path)
if py3 and base.endswith('__pycache__'): if base.endswith('__pycache__'):
path_old = os.path.join(base, name) path_old = os.path.join(base, name)
m = re_pycache_file.match(name) m = re_pycache_file.match(name)
path_new = os.path.join(base, os.pardir, m.group(1) + m.group(2)) path_new = os.path.join(base, os.pardir, m.group(1) + m.group(2))
log.info("Renaming Python 3 .pyc file from [%s] to [%s]" % (path_old, path_new)) log.info("Renaming file from [%s] to [%s]" % (path_old, path_new))
if os.path.exists(path_new): if os.path.exists(path_new):
os.unlink(path_new) os.unlink(path_new)
os.rename(path_old, path_new) os.rename(path_old, path_new)
......
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