mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Closes #29213: Merged fix from 3.6.

Browse source
This commit is contained in:
Vinay Sajip 2017-02-02 19:33:43 +00:00
parent 7601d780a7
commit 144fff8b90
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/venv/__init__.py
View file

@ -320,19 +320,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)

2
Lib/venv/scripts/nt/Activate.ps1
View file

@ -26,7 +26,7 @@ function global:deactivate ([switch]$NonDestructive) {
} }
deactivate -nondestructive deactivate -nondestructive
$env:VIRTUAL_ENV="__VENV_DIR__" $env:VIRTUAL_ENV="__VENV_DIR__"
if (! $env:VIRTUAL_ENV_DISABLE_PROMPT) { if (! $env:VIRTUAL_ENV_DISABLE_PROMPT) {