Closes #29213: Merged fix from 3.6.
This commit is contained in:
parent
7601d780a7
commit
144fff8b90
|
@ -320,19 +320,17 @@ class EnvBuilder:
|
|||
dstfile = os.path.join(dstdir, f)
|
||||
with open(srcfile, 'rb') as f:
|
||||
data = f.read()
|
||||
if srcfile.endswith('.exe'):
|
||||
mode = 'wb'
|
||||
else:
|
||||
mode = 'w'
|
||||
if not srcfile.endswith('.exe'):
|
||||
try:
|
||||
data = data.decode('utf-8')
|
||||
data = self.replace_variables(data, context)
|
||||
except UnicodeDecodeError as e:
|
||||
data = data.encode('utf-8')
|
||||
except UnicodeError as e:
|
||||
data = None
|
||||
logger.warning('unable to copy script %r, '
|
||||
'may be binary: %s', srcfile, e)
|
||||
if data is not None:
|
||||
with open(dstfile, mode) as f:
|
||||
with open(dstfile, 'wb') as f:
|
||||
f.write(data)
|
||||
shutil.copymode(srcfile, dstfile)
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ function global:deactivate ([switch]$NonDestructive) {
|
|||
}
|
||||
|
||||
deactivate -nondestructive
|
||||
|
||||
|
||||
$env:VIRTUAL_ENV="__VENV_DIR__"
|
||||
|
||||
if (! $env:VIRTUAL_ENV_DISABLE_PROMPT) {
|
||||
|
|
Loading…
Reference in New Issue