Kaydet (Commit) 63763702 authored tarafından Florent Xicluna's avatar Florent Xicluna

Revert r78830: realpath() should really be applied to sys.executable.

üst 6602ec6e
...@@ -84,8 +84,7 @@ _PREFIX = os.path.normpath(sys.prefix) ...@@ -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))
...@@ -295,7 +294,7 @@ def _init_non_posix(vars): ...@@ -295,7 +294,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
......
...@@ -135,7 +135,7 @@ class ProcessTestCase(unittest.TestCase): ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment