traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes #29213: regularised EOLs of venv scripts.

This commit is contained in:
Vinay Sajip 2017-02-02 19:25:24 +00:00
parent db6322cb8a
commit db38b6c9a9
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/venv/__init__.py
View File

@ -339,19 +339,17 @@ class EnvBuilder:
dstfile = os.path.join(dstdir, f) dstfile = os.path.join(dstdir, f)
with open(srcfile, 'rb') as f: with open(srcfile, 'rb') as f:
data = f.read() data = f.read()
if srcfile.endswith('.exe'): if not srcfile.endswith('.exe'):
mode = 'wb'
else:
mode = 'w'
try: try:
data = data.decode('utf-8') data = data.decode('utf-8')
data = self.replace_variables(data, context) data = self.replace_variables(data, context)
except UnicodeDecodeError as e: data = data.encode('utf-8')
except UnicodeError as e:
data = None data = None
logger.warning('unable to copy script %r, ' logger.warning('unable to copy script %r, '
'may be binary: %s', srcfile, e) 'may be binary: %s', srcfile, e)
if data is not None: if data is not None:
with open(dstfile, mode) as f: with open(dstfile, 'wb') as f:
f.write(data) f.write(data)
shutil.copymode(srcfile, dstfile) shutil.copymode(srcfile, dstfile)