traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backport of Guido's review of my patch.

This commit is contained in:
Christian Heimes 2007-11-07 18:30:22 +00:00
parent cea681be19
commit 004c1c1562
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Python/import.c
View File

@ -2996,12 +2996,12 @@ NullImporter_init(NullImporter *self, PyObject *args, PyObject *kwds)
struct stat statbuf;
int rv;
#ifdef MS_WINDOWS
/* MS Windows' stat chokes on paths like C:\\path\\. Try to
* recover *one* time by stripping of a trailing slash or
* back slash. http://bugs.python.org/issue1293
*/
rv = stat(path, &statbuf);
#ifdef MS_WINDOWS
/* MS Windows stat() chokes on paths like C:\path\. Try to
* recover *one* time by stripping off a trailing slash or
* backslash. http://bugs.python.org/issue1293
*/
if (rv != 0 && pathlen <= MAXPATHLEN &&
(path[pathlen-1] == '/' || path[pathlen-1] == '\\')) {
char mangled[MAXPATHLEN+1];
@ -3010,8 +3010,6 @@ NullImporter_init(NullImporter *self, PyObject *args, PyObject *kwds)
mangled[pathlen-1] = '\0';
rv = stat(mangled, &statbuf);
}
#else
rv = stat(path, &statbuf);
#endif
if (rv == 0) {
/* it exists */