summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Golden <mail@timgolden.me.uk>2012-11-06 15:32:50 +0000
committerTim Golden <mail@timgolden.me.uk>2012-11-06 15:32:50 +0000
commit3df8887fdfd67b4c82cef278d791a0255c744ff5 (patch)
tree46e704bd9cdbff525c45591ea6c1f204a9859c28
parent7fd4b68a7061c1199e00cb0b3cfd9ce0d44937f4 (diff)
downloadcpython-git-3df8887fdfd67b4c82cef278d791a0255c744ff5.tar.gz
Backed out changeset 5cf6c427fd39
-rw-r--r--Lib/glob.py32
1 files changed, 16 insertions, 16 deletions
diff --git a/Lib/glob.py b/Lib/glob.py
index 3336504df1..2d3132d1ea 100644
--- 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`