mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merged revisions 78833 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78833 | florent.xicluna | 2010-03-11 02:50:48 +0100 (jeu, 11 mar 2010) | 2 lines

  Revert r78830: realpath() should really be applied to sys.executable.
........
This commit is contained in:
Florent Xicluna 2010-03-11 01:53:10 +00:00
parent ecf021c7c0
commit 1d1ab9734a
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/sysconfig.py
View file

@ -84,8 +84,7 @@ _PREFIX = os.path.normpath(sys.prefix)
_EXEC_PREFIX = os.path.normpath(sys.exec_prefix) _EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
_CONFIG_VARS = None _CONFIG_VARS = None
_USER_BASE = None _USER_BASE = None
# Note: sys.executable can be '' or even a directory, until #7774 is fixed. _PROJECT_BASE = os.path.dirname(realpath(sys.executable))
_PROJECT_BASE = realpath(os.path.dirname(sys.executable))
if os.name == "nt" and "pcbuild" in _PROJECT_BASE[-8:].lower(): if os.name == "nt" and "pcbuild" in _PROJECT_BASE[-8:].lower():
_PROJECT_BASE = realpath(os.path.join(_PROJECT_BASE, pardir)) _PROJECT_BASE = realpath(os.path.join(_PROJECT_BASE, pardir))
@ -297,7 +296,7 @@ def _init_non_posix(vars):
vars['SO'] = '.pyd' vars['SO'] = '.pyd'
vars['EXE'] = '.exe' vars['EXE'] = '.exe'
vars['VERSION'] = _PY_VERSION_SHORT_NO_DOT vars['VERSION'] = _PY_VERSION_SHORT_NO_DOT
vars['BINDIR'] = realpath(os.path.dirname(sys.executable)) vars['BINDIR'] = os.path.dirname(realpath(sys.executable))
# #
# public APIs # public APIs

2
Lib/test/test_subprocess.py
View file

@ -135,7 +135,7 @@ class ProcessTestCase(unittest.TestCase):
self.assertEqual(p.stderr, None) self.assertEqual(p.stderr, None)
def test_executable_with_cwd(self): def test_executable_with_cwd(self):
python_dir = os.path.realpath(os.path.dirname(sys.executable)) python_dir = os.path.dirname(os.path.realpath(sys.executable))
p = subprocess.Popen(["somethingyoudonthave", "-c", p = subprocess.Popen(["somethingyoudonthave", "-c",
"import sys; sys.exit(47)"], "import sys; sys.exit(47)"],
executable=sys.executable, cwd=python_dir) executable=sys.executable, cwd=python_dir)