diff options
author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2017-02-02 19:26:48 +0000 |
---|---|---|
committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2017-02-02 19:26:48 +0000 |
commit | 19d8ebcbbd396ec603ed03bc79add9b049c31919 (patch) | |
tree | 029da29d02a43c8d5273af7cdb34748c03bb8821 /Lib/venv | |
parent | 474ecf16ed434144efc0e1de383efda76f011e3f (diff) | |
parent | ef37141cf58ef24b0096f9ab7fe888b39167f9ec (diff) | |
download | cpython-19d8ebcbbd396ec603ed03bc79add9b049c31919.tar.gz |
Fixes #29213: merged fix from 3.5.
Diffstat (limited to 'Lib/venv')
-rw-r--r-- | Lib/venv/__init__.py | 10 | ||||
-rw-r--r-- | Lib/venv/scripts/nt/Activate.ps1 | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py index 308e046650..716129d139 100644 --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py @@ -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) diff --git a/Lib/venv/scripts/nt/Activate.ps1 b/Lib/venv/scripts/nt/Activate.ps1 index c22b1ea182..85646c89a8 100644 --- a/Lib/venv/scripts/nt/Activate.ps1 +++ b/Lib/venv/scripts/nt/Activate.ps1 @@ -26,7 +26,7 @@ function global:deactivate ([switch]$NonDestructive) { }
deactivate -nondestructive
- +
$env:VIRTUAL_ENV="__VENV_DIR__"
if (! $env:VIRTUAL_ENV_DISABLE_PROMPT) {
|