mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 11:08:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Backed out changeset 5cf6c427fd39

Browse source
This commit is contained in:
Tim Golden 2012-11-06 15:32:50 +00:00
parent 7fd4b68a70
commit 3df8887fdf
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Lib/glob.py
View file

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