traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Vinay Sajip 2012-11-23 19:16:49 +00:00
parent 44dcd6bcb2
commit 27e4b6059e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/site.py
View File

@ -503,15 +503,13 @@ def venv(known_paths):
executable = os.environ['__PYVENV_LAUNCHER__'] executable = os.environ['__PYVENV_LAUNCHER__']
else: else:
executable = sys.executable executable = sys.executable
executable_dir, executable_name = os.path.split(executable) exe_dir, _ = os.path.split(os.path.abspath(executable))
site_prefix = os.path.dirname(executable_dir) site_prefix = os.path.dirname(exe_dir)
sys._home = None sys._home = None
if sys.platform == 'win32':
executable_name = os.path.splitext(executable_name)[0]
conf_basename = 'pyvenv.cfg' conf_basename = 'pyvenv.cfg'
candidate_confs = [ candidate_confs = [
conffile for conffile in ( 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) os.path.join(site_prefix, conf_basename)
) )
if os.path.isfile(conffile) if os.path.isfile(conffile)