]> granicus.if.org Git - python/commitdiff
Fix indentation
authorJason R. Coombs <jaraco@jaraco.com>
Fri, 13 Jan 2012 22:59:05 +0000 (17:59 -0500)
committerJason R. Coombs <jaraco@jaraco.com>
Fri, 13 Jan 2012 22:59:05 +0000 (17:59 -0500)
Python/import.c

index dd8710eb057c5ed82f1eee8aaa2d75a7333d594d..3fc975460a05887aa8fffc2e9f06b9e4cba35fbe 100644 (file)
@@ -116,28 +116,28 @@ static const struct filedescr _PyImport_StandardFiletab[] = {
 
 #ifdef MS_WINDOWS
 int isdir(char *path) {
-       DWORD rv;
-       /* see issue1293 and issue3677:
-        * stat() on Windows doesn't recognise paths like
-        * "e:\\shared\\" and "\\\\whiterab-c2znlh\\shared" as dirs.
-        * Also reference issue6727:
-        * stat() on Windows is broken and doesn't resolve symlinks properly.
-        */
-       rv = GetFileAttributesA(path);
-       return rv != INVALID_FILE_ATTRIBUTES && rv & FILE_ATTRIBUTE_DIRECTORY;
+    DWORD rv;
+    /* see issue1293 and issue3677:
+     * stat() on Windows doesn't recognise paths like
+     * "e:\\shared\\" and "\\\\whiterab-c2znlh\\shared" as dirs.
+     * Also reference issue6727:
+     * stat() on Windows is broken and doesn't resolve symlinks properly.
+     */
+    rv = GetFileAttributesA(path);
+    return rv != INVALID_FILE_ATTRIBUTES && rv & FILE_ATTRIBUTE_DIRECTORY;
 }
 #else
 #if HAVE_STAT
 int isdir(char *path) {
     struct stat statbuf;
-       return stat(path, &statbuf) == 0 && S_ISDIR(statbuf.st_mode);
+    return stat(path, &statbuf) == 0 && S_ISDIR(statbuf.st_mode);
 }
 #else
 #ifdef RISCOS
 /* with RISCOS, isdir is in unixstuff */
 #else
 int isdir(char *path) {
-       return 0;
+    return 0;
 }
 #endif /* RISCOS */
 #endif /* HAVE_STAT */
@@ -3200,11 +3200,11 @@ NullImporter_init(NullImporter *self, PyObject *args, PyObject *kwds)
         PyErr_SetString(PyExc_ImportError, "empty pathname");
         return -1;
     } else {
-               if(isdir(path)) {
-                       PyErr_SetString(PyExc_ImportError,
-                                                       "existing directory");
-                       return -1;
-               }
+        if(isdir(path)) {
+            PyErr_SetString(PyExc_ImportError,
+                            "existing directory");
+            return -1;
+        }
     }
     return 0;
 }