Merged revisions 78835-78837 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78835 | victor.stinner | 2010-03-11 13:34:39 +0100 (jeu., 11 mars 2010) | 7 lines

  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.
........
  r78836 | victor.stinner | 2010-03-11 14:27:35 +0100 (jeu., 11 mars 2010) | 4 lines

  Fix test_executable introduce in previous commit (r78835): Windows is able to
  retrieve the absolute Python path even if argv[0] has been set to a non
  existent program name.
........
  r78837 | victor.stinner | 2010-03-11 14:46:06 +0100 (jeu., 11 mars 2010) | 3 lines

  Another fix to test_executable() of test_sys: set the current working to avoid
  the #7774 bug.
........

diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index 619e4583bd05efe1e1fcff5a3171b4ee958f2d19..0122f084765ed682772a41006d5d19a737fee5b0 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 e20c95f0d31c6295ddc00abd1cb3eec6dbbaea5c..eb0bef873139a5f732e38ee6c66b6745cf0c6320 100644 (file)
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -479,6 +479,23 @@ class SysModuleTest(unittest.TestCase):
         out = p.communicate()[0].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):
 

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