Backed out changeset 5cf6c427fd39

diff --git a/Lib/glob.py b/Lib/glob.py
index 3336504df14e3146c6bc430e27734b91be773e67..2d3132d1ea8c8df381f977a96449aadbc5fc21ea 100644 (file)
--- a/Lib/glob.py
+++ b/Lib/glob.py
@@ -27,22 +27,22 @@ def iglob(pathname):
         return
     pathnames = expand_braces(pathname)
     for pathname in pathnames:
-        dirname, basename = os.path.split(pathname)
-        if not dirname:
-            yield from glob1(None, basename)
-            return
-
-        if has_magic(dirname):
-            dirs = iglob(dirname)
-        else:
-            dirs = [dirname]
-        if has_magic(basename):
-            glob_in_dir = glob1
-        else:
-            glob_in_dir = glob0
-        for dirname in dirs:
-            for name in glob_in_dir(dirname, basename):
-                yield os.path.join(dirname, name)
+      dirname, basename = os.path.split(pathname)
+      if not dirname:
+          yield from glob1(None, basename)
+          return
+
+      if has_magic(dirname):
+          dirs = iglob(dirname)
+      else:
+          dirs = [dirname]
+      if has_magic(basename):
+          glob_in_dir = glob1
+      else:
+          glob_in_dir = glob0
+      for dirname in dirs:
+          for name in glob_in_dir(dirname, basename):
+              yield os.path.join(dirname, name)
 
 # These 2 helper functions non-recursively glob inside a literal directory.
 # They return a list of basenames. `glob1` accepts a pattern while `glob0`