mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 78835-78837 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Victor Stinner 2010-03-12 14:20:59 +00:00
parent 4d1246b3aa
commit 171ba0504a
3 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/getpath.c
View file

@ -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';