From 004c1c15621eff6bda20c66ce4e5d5c49c90ff25 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Wed, 7 Nov 2007 18:30:22 +0000
Subject: [PATCH] Backport of Guido's review of my patch.

---
 Python/import.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Python/import.c b/Python/import.c
index 265afb951b9..6a4d22f6e64 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -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 */