[Python-checkins] cpython (merge 3.4 -> default): Issue #18807: Merged fix from 3.4.

[vinay.sajip]

http://hg.python.org/cpython/rev/f2adaccc13ab
changeset:   90874:f2adaccc13ab
parent:      90872:d2588e0a4a95
parent:      90873:ce1b8b2ddf07
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Wed May 28 08:08:32 2014 +0100
summary:
  Issue #18807: Merged fix from 3.4.

files:
  Lib/venv/__init__.py |  5 ++++-
  Misc/NEWS            |  4 ++++
  2 files changed, 8 insertions(+), 1 deletions(-)


diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py
--- a/Lib/venv/__init__.py
+++ b/Lib/venv/__init__.py
@@ -212,7 +212,10 @@
             for suffix in ('python', 'python3'):
                 path = os.path.join(binpath, suffix)
                 if not os.path.exists(path):
-                    os.symlink(exename, path)
+                    # Issue 18807: make copies if
+                    # symlinks are not wanted
+                    copier(context.env_exe, path)
+                    os.chmod(path, 0o755)
         else:
             subdir = 'DLLs'
             include = self.include_binary
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -91,6 +91,10 @@
 Library
 -------
 
+- Issue #18807: If copying (no symlinks) specified for a venv, then the python
+  interpreter aliases (python, python3) are now created by copying rather than
+  symlinking.
+
 - Issue #20197: Added support for the WebP image type in the imghdr module.
   Patch by Fabrice Aneche and Claudiu Popa.
 

-- 
Repository URL: http://hg.python.org/cpython