Commit ce015a9c authored by Guido van Rossum's avatar Guido van Rossum

Cosmetic changes to Christian's patch r58903.

(Consider this code review feedback. :-)
parent d3b0de09
...@@ -2939,12 +2939,12 @@ NullImporter_init(NullImporter *self, PyObject *args, PyObject *kwds) ...@@ -2939,12 +2939,12 @@ NullImporter_init(NullImporter *self, PyObject *args, PyObject *kwds)
struct stat statbuf; struct stat statbuf;
int rv; int rv;
rv = stat(path, &statbuf);
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
/* MS Windows' stat chokes on paths like C:\\path\\. Try to /* MS Windows stat() chokes on paths like C:\path\. Try to
* recover *one* time by stripping of a trailing slash or * recover *one* time by stripping off a trailing slash or
* back slash. http://bugs.python.org/issue1293 * backslash. http://bugs.python.org/issue1293
*/ */
rv = stat(path, &statbuf);
if (rv != 0 && pathlen <= MAXPATHLEN && if (rv != 0 && pathlen <= MAXPATHLEN &&
(path[pathlen-1] == '/' || path[pathlen-1] == '\\')) { (path[pathlen-1] == '/' || path[pathlen-1] == '\\')) {
char mangled[MAXPATHLEN+1]; char mangled[MAXPATHLEN+1];
...@@ -2953,8 +2953,6 @@ NullImporter_init(NullImporter *self, PyObject *args, PyObject *kwds) ...@@ -2953,8 +2953,6 @@ NullImporter_init(NullImporter *self, PyObject *args, PyObject *kwds)
mangled[pathlen-1] = '\0'; mangled[pathlen-1] = '\0';
rv = stat(mangled, &statbuf); rv = stat(mangled, &statbuf);
} }
#else
rv = stat(path, &statbuf);
#endif #endif
if (rv == 0) { if (rv == 0) {
/* it exists */ /* it exists */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment