From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Fri, 23 Nov 2012 19:16:49 +0000 (+0000)
Subject: Issue #16519: Used os.path.abspath, removed unnecessary code for executable_name.
X-Git-Tag: v3.3.1rc1~600
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27e4b6059e6414d88c7284bbcccebb55b0957bc5;p=thirdparty%2FPython%2Fcpython.git

Issue #16519: Used os.path.abspath, removed unnecessary code for executable_name.
---

diff --git a/Lib/site.py b/Lib/site.py
index 0aaf46b62f05..b751006c88e8 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -503,15 +503,13 @@ def venv(known_paths):
         executable = os.environ['__PYVENV_LAUNCHER__']
     else:
         executable = sys.executable
-    executable_dir, executable_name = os.path.split(executable)
-    site_prefix = os.path.dirname(executable_dir)
+    exe_dir, _ = os.path.split(os.path.abspath(executable))
+    site_prefix = os.path.dirname(exe_dir)
     sys._home = None
-    if sys.platform == 'win32':
-        executable_name = os.path.splitext(executable_name)[0]
     conf_basename = 'pyvenv.cfg'
     candidate_confs = [
         conffile for conffile in (
-            os.path.join(executable_dir, conf_basename),
+            os.path.join(exe_dir, conf_basename),
             os.path.join(site_prefix, conf_basename)
             )
         if os.path.isfile(conffile)