[Python-checkins] r78831 - in python/branches/py3k: Lib/sysconfig.py Lib/test/test_subprocess.py
florent.xicluna
python-checkins at python.org
Thu Mar 11 02:00:26 CET 2010
Author: florent.xicluna
Date: Thu Mar 11 02:00:26 2010
New Revision: 78831
Log:
Merged revisions 78830 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78830 | florent.xicluna | 2010-03-11 01:56:59 +0100 (jeu, 11 mar 2010) | 3 lines
Fix the test_subprocess failure when sys.executable is meaningless: '' or a directory.
It does not fix #7774.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/sysconfig.py
python/branches/py3k/Lib/test/test_subprocess.py
Modified: python/branches/py3k/Lib/sysconfig.py
==============================================================================
--- python/branches/py3k/Lib/sysconfig.py (original)
+++ python/branches/py3k/Lib/sysconfig.py Thu Mar 11 02:00:26 2010
@@ -84,7 +84,8 @@
_EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
_CONFIG_VARS = None
_USER_BASE = None
-_PROJECT_BASE = os.path.dirname(realpath(sys.executable))
+# Note: sys.executable can be '' or even a directory, until #7774 is fixed.
+_PROJECT_BASE = realpath(os.path.dirname(sys.executable))
if os.name == "nt" and "pcbuild" in _PROJECT_BASE[-8:].lower():
_PROJECT_BASE = realpath(os.path.join(_PROJECT_BASE, pardir))
@@ -296,7 +297,7 @@
vars['SO'] = '.pyd'
vars['EXE'] = '.exe'
vars['VERSION'] = _PY_VERSION_SHORT_NO_DOT
- vars['BINDIR'] = os.path.dirname(realpath(sys.executable))
+ vars['BINDIR'] = realpath(os.path.dirname(sys.executable))
#
# public APIs
Modified: python/branches/py3k/Lib/test/test_subprocess.py
==============================================================================
--- python/branches/py3k/Lib/test/test_subprocess.py (original)
+++ python/branches/py3k/Lib/test/test_subprocess.py Thu Mar 11 02:00:26 2010
@@ -135,7 +135,7 @@
self.assertEqual(p.stderr, None)
def test_executable_with_cwd(self):
- python_dir = os.path.dirname(os.path.realpath(sys.executable))
+ python_dir = os.path.realpath(os.path.dirname(sys.executable))
p = subprocess.Popen(["somethingyoudonthave", "-c",
"import sys; sys.exit(47)"],
executable=sys.executable, cwd=python_dir)
More information about the Python-checkins
mailing list