diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-21 13:47:28 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-21 13:47:28 (GMT) |
| commit | 872d636cc90ed7b78a8b847c4aa4e7621d5f0db9 (patch) | |
| tree | 23fb52077bb3cd34109fbec3a9b6304205c00de1 /Modules | |
| parent | bb71dc4396c8147feaa94eca62ac1c4c5d13d5ce (diff) | |
| download | cpython-872d636cc90ed7b78a8b847c4aa4e7621d5f0db9.zip cpython-872d636cc90ed7b78a8b847c4aa4e7621d5f0db9.tar.gz cpython-872d636cc90ed7b78a8b847c4aa4e7621d5f0db9.tar.bz2 | |
Merged revisions 78835-78837,78870 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.
........
r78870 | victor.stinner | 2010-03-12 15:30:26 +0100 (ven., 12 mars 2010) | 1 line
NEWS: issue #7774 is related to Library (sys), not Core and Builtins
........
Diffstat (limited to 'Modules')
| -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 09fbe10..682ad3e 100644 --- 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'; |