Cosmetic changes to Christian's patch r58903.

(Consider this code review feedback. :-)
This commit is contained in:
Guido van Rossum 2007-11-07 17:46:34 +00:00
parent 7d3bc0ade6
commit c1bdbc316d
1 changed files with 5 additions and 7 deletions

View File

@ -2939,12 +2939,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];
@ -2953,8 +2953,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 */