diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-11 00:05:17 +0000 |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-11 00:05:17 +0000 |
| commit | a470738b7bf68c3f9bd4063cbef5c0db66bc04a8 (patch) | |
| tree | 3801b8607241aa2f3dfd0a42dad49b7a8f6a5287 /Lib/sysconfig.py | |
| parent | 0f64b0b9a350d7ac34836d5cb858de4135d8b0e4 (diff) | |
| download | cpython-git-a470738b7bf68c3f9bd4063cbef5c0db66bc04a8.tar.gz | |
Merged revisions 78828 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78828 | florent.xicluna | 2010-03-11 00:58:42 +0100 (jeu, 11 mar 2010) | 2 lines
Issue #7880: Fix sysconfig when the python executable is a symbolic link.
........
Diffstat (limited to 'Lib/sysconfig.py')
| -rw-r--r-- | Lib/sysconfig.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py index 4554003b99..619e4583bd 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -3,7 +3,7 @@ """ import sys import os -from os.path import pardir, abspath +from os.path import pardir, realpath _INSTALL_SCHEMES = { 'posix_prefix': { @@ -84,16 +84,16 @@ _PREFIX = os.path.normpath(sys.prefix) _EXEC_PREFIX = os.path.normpath(sys.exec_prefix) _CONFIG_VARS = None _USER_BASE = None -_PROJECT_BASE = abspath(os.path.dirname(sys.executable)) +_PROJECT_BASE = os.path.dirname(realpath(sys.executable)) if os.name == "nt" and "pcbuild" in _PROJECT_BASE[-8:].lower(): - _PROJECT_BASE = abspath(os.path.join(_PROJECT_BASE, pardir)) + _PROJECT_BASE = realpath(os.path.join(_PROJECT_BASE, pardir)) # PC/VS7.1 if os.name == "nt" and "\\pc\\v" in _PROJECT_BASE[-10:].lower(): - _PROJECT_BASE = abspath(os.path.join(_PROJECT_BASE, pardir, pardir)) + _PROJECT_BASE = realpath(os.path.join(_PROJECT_BASE, pardir, pardir)) # PC/AMD64 if os.name == "nt" and "\\pcbuild\\amd64" in _PROJECT_BASE[-14:].lower(): - _PROJECT_BASE = abspath(os.path.join(_PROJECT_BASE, pardir, pardir)) + _PROJECT_BASE = realpath(os.path.join(_PROJECT_BASE, pardir, pardir)) def is_python_build(): for fn in ("Setup.dist", "Setup.local"): @@ -296,7 +296,7 @@ def _init_non_posix(vars): vars['SO'] = '.pyd' vars['EXE'] = '.exe' vars['VERSION'] = _PY_VERSION_SHORT_NO_DOT - vars['BINDIR'] = os.path.dirname(os.path.abspath(sys.executable)) + vars['BINDIR'] = os.path.dirname(realpath(sys.executable)) # # public APIs |