[Python-checkins] r78835 - in python/trunk: Lib/sysconfig.py Lib/test/test_sys.py Misc/NEWS Modules/getpath.c

[victor.stinner]

Author: victor.stinner
Date: Thu Mar 11 13:34:39 2010
New Revision: 78835

Log:
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.


Modified:
   python/trunk/Lib/sysconfig.py
   python/trunk/Lib/test/test_sys.py
   python/trunk/Misc/NEWS
   python/trunk/Modules/getpath.c

Modified: python/trunk/Lib/sysconfig.py
==============================================================================
--- python/trunk/Lib/sysconfig.py	(original)
+++ python/trunk/Lib/sysconfig.py	Thu Mar 11 13:34:39 2010
@@ -84,7 +84,12 @@
 _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))

Modified: python/trunk/Lib/test/test_sys.py
==============================================================================
--- python/trunk/Lib/test/test_sys.py	(original)
+++ python/trunk/Lib/test/test_sys.py	Thu Mar 11 13:34:39 2010
@@ -437,6 +437,17 @@
         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):
 

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Thu Mar 11 13:34:39 2010
@@ -12,6 +12,10 @@
 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

Modified: python/trunk/Modules/getpath.c
==============================================================================
--- python/trunk/Modules/getpath.c	(original)
+++ python/trunk/Modules/getpath.c	Thu Mar 11 13:34:39 2010
@@ -441,7 +441,7 @@
 	}
 	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';