diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 149f473d9ea..5c18006ee60 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -395,6 +395,20 @@ class SysModuleTest(unittest.TestCase): self.assertEqual(sys.call_tracing(str, (2,)), "2") self.assertRaises(TypeError, sys.call_tracing, str, 2) + def test_executable(self): + # Issue #7774: Ensure that sys.executable is an empty string if argv[0] + # has been set to an non existent program name and Python is unable to + # retrieve the real program name + import subprocess + # For a normal installation, it should work without 'cwd' + # argument. For test runs in the build directory, see #7774. + python_dir = os.path.dirname(os.path.realpath(sys.executable)) + p = subprocess.Popen( + ["nonexistent", "-c", 'import sys; print repr(sys.executable)'], + executable=sys.executable, stdout=subprocess.PIPE, cwd=python_dir) + executable = p.communicate()[0].strip() + p.wait() + self.assert_(executable in ["''", repr(sys.executable)], executable) class SizeofTest(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS index 6d438ca176b..1ab0c8809bd 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -21,6 +21,10 @@ Core and Builtins Library ------- +- Issue #7774: Set sys.executable to an empty string if argv[0] has been + set to an non existent program name and Python is unable to retrieve the real + program name + - Issue #1054943: Fix unicodedata.normalize('NFC', text) for the Public Review Issue #29 diff --git a/Modules/getpath.c b/Modules/getpath.c index 09fbe1017b1..682ad3ed659 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -441,7 +441,7 @@ calculate_path(void) } else progpath[0] = '\0'; - if (progpath[0] != SEP) + if (progpath[0] != SEP && progpath[0] != '\0') absolutize(progpath); strncpy(argv0_path, progpath, MAXPATHLEN); argv0_path[MAXPATHLEN] = '\0';