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.

Fix also sysconfig: if sys.executable is an empty string, use the current
working directory.

diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index 69264d2e4811cce71a0cf2a513307f6db4ea7ecd..a11a41247583f7d40bc5feed7d29444bb6fd7601 100644 (file)
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -84,7 +84,12 @@ _PREFIX = os.path.normpath(sys.prefix)
 _EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
 _CONFIG_VARS = None
 _USER_BASE = None
-_PROJECT_BASE = os.path.dirname(realpath(sys.executable))
+if sys.executable:
+    _PROJECT_BASE = os.path.dirname(realpath(sys.executable))
+else:
+    # sys.executable can be empty if argv[0] has been changed and Python is
+    # unable to retrieve the real program name
+    _PROJECT_BASE = realpath(os.getcwd())
 
 if os.name == "nt" and "pcbuild" in _PROJECT_BASE[-8:].lower():
     _PROJECT_BASE = realpath(os.path.join(_PROJECT_BASE, pardir))

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 15b88ceb3982cad1707abc3464da38c34632b93c..e41814bfd60532ba0f46f77b15f0ec4b40dc14c4 100644 (file)
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -437,6 +437,17 @@ 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
+        p = subprocess.Popen(
+            ["nonexistent", "-c", 'import sys; print "executable=%r" % sys.executable'],
+            executable=sys.executable, stdout=subprocess.PIPE)
+        executable = p.communicate()[0].strip()
+        p.wait()
+        self.assertEqual(executable, "executable=''")
 
 class SizeofTest(unittest.TestCase):
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 8f450a9fd5974e0d0b2ec8b408f09ac3fb42aa21..a64bd16fca688afc353097be8faa8fbffd16d298 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,10 @@ What's New in Python 2.7 beta 1?
 Core and Builtins
 -----------------
 
+- 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 #3137: Don't ignore errors at startup, especially a keyboard interrupt
   (SIGINT). If an error occurs while importing the site module, the error is
   printed and Python exits. Initialize the GIL before importing the site

diff --git a/Modules/getpath.c b/Modules/getpath.c
index 09fbe1017b18742def1ca40561e1e44df7d88ad6..682ad3ed659f573b4d98872fce56eee26ad43d44 100644 (file)
--- 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';