1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use yield from

Browse Source
This commit is contained in:
Benjamin Peterson 2012-05-10 16:17:35 -05:00
parent e8751e05d9
commit 569d087574
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/os.py
View File

@ -294,8 +294,7 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
for name in dirs: for name in dirs:
new_path = join(top, name) new_path = join(top, name)
if followlinks or not islink(new_path): if followlinks or not islink(new_path):
for x in walk(new_path, topdown, onerror, followlinks): yield from walk(new_path, topdown, onerror, followlinks)
yield x
if not topdown: if not topdown:
yield top, dirs, nondirs yield top, dirs, nondirs
@ -339,8 +338,7 @@ if _exists("openat"):
try: try:
if (followlinks or (st.S_ISDIR(orig_st.st_mode) and if (followlinks or (st.S_ISDIR(orig_st.st_mode) and
path.samestat(orig_st, fstat(topfd)))): path.samestat(orig_st, fstat(topfd)))):
for x in _fwalk(topfd, top, topdown, onerror, followlinks): yield from _fwalk(topfd, top, topdown, onerror, followlinks)
yield x
finally: finally:
close(topfd) close(topfd)
@ -377,8 +375,7 @@ if _exists("openat"):
try: try:
if followlinks or path.samestat(orig_st, fstat(dirfd)): if followlinks or path.samestat(orig_st, fstat(dirfd)):
dirpath = path.join(toppath, name) dirpath = path.join(toppath, name)
for x in _fwalk(dirfd, dirpath, topdown, onerror, followlinks): yield from _fwalk(dirfd, dirpath, topdown, onerror, followlinks)
yield x
finally: finally:
close(dirfd) close(dirfd)