diff options
| -rw-r--r-- | Lib/glob.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Lib/glob.py b/Lib/glob.py index 2d3132d1ea..3336504df1 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` |