diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-12 14:20:59 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-12 14:20:59 (GMT) |
| commit | 171ba0504aa778d81346ea56fc9000b29d4d3e1d (patch) | |
| tree | 587a3ad2f16e74fdb46bf08130662a887aac8e7b /Modules/getpath.c | |
| parent | 4d1246b3aa9dca4339aeaded3406bf4e34f3585d (diff) | |
| download | cpython-171ba0504aa778d81346ea56fc9000b29d4d3e1d.zip cpython-171ba0504aa778d81346ea56fc9000b29d4d3e1d.tar.gz cpython-171ba0504aa778d81346ea56fc9000b29d4d3e1d.tar.bz2 | |
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.
........
Diffstat (limited to 'Modules/getpath.c')
| -rw-r--r-- | Modules/getpath.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/getpath.c b/Modules/getpath.c index a371cb3..c6e50d3 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'; |