summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2010-03-11 01:53:10 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2010-03-11 01:53:10 (GMT)
commit1d1ab9734a0e5778a494d1be4c47f8e181371a00 (patch)
tree3801b8607241aa2f3dfd0a42dad49b7a8f6a5287 /Lib/test
parentecf021c7c0caf4698cf704d03af4eb3d366fcdd5 (diff)
downloadcpython-1d1ab9734a0e5778a494d1be4c47f8e181371a00.zip
cpython-1d1ab9734a0e5778a494d1be4c47f8e181371a00.tar.gz
cpython-1d1ab9734a0e5778a494d1be4c47f8e181371a00.tar.bz2
Merged revisions 78833 via svnmerge from
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. ........
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_subprocess.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 64bfabb..dff9012 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -135,7 +135,7 @@ class ProcessTestCase(unittest.TestCase):
self.assertEqual(p.stderr, None)
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",
"import sys; sys.exit(47)"],
executable=sys.executable, cwd=python_dir)