diff options
| -rw-r--r-- | Lib/test/test_sys.py | 17 | ||||
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Modules/getpath.c | 2 |
3 files changed, 22 insertions, 1 deletions
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 1678397..d7b9cd8 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -438,6 +438,23 @@ class SysModuleTest(unittest.TestCase): out = p.stdout.read().strip() self.assertEqual(out, b'?') + 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(sys.executable.encode("ascii", "backslashreplace"))'], + executable=sys.executable, stdout=subprocess.PIPE, cwd=python_dir) + stdout = p.communicate()[0] + executable = stdout.strip().decode("ASCII") + p.wait() + self.assertIn(executable, ["b''", repr(sys.executable.encode("ascii", "backslashreplace"))]) + class SizeofTest(unittest.TestCase): @@ -135,6 +135,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 #6509: fix re.sub to work properly when the pattern, the string, and the replacement were all bytes. Patch by Antoine Pitrou. diff --git a/Modules/getpath.c b/Modules/getpath.c index b7f178e..3cbfa42 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -522,7 +522,7 @@ calculate_path(void) } else progpath[0] = '\0'; - if (progpath[0] != SEP) + if (progpath[0] != SEP && progpath[0] != '\0') absolutize(progpath); wcsncpy(argv0_path, progpath, MAXPATHLEN); argv0_path[MAXPATHLEN] = '\0'; |