Issue #25995: os.walk() no longer uses FDs proportional to the tree depth.

serhiy-storchaka · serhiy-storchaka · commit 7c90a82a01ae · 2016-02-11T13:31:00.000+02:00
Different solution from 3.5.
diff --git a/Lib/os.py b/Lib/os.py
@@ -356,6 +356,7 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
 
     dirs = []
     nondirs = []
+    walk_dirs = []
 
     # We may not have read permission for top, in which case we can't
     # get a list of the files the directory contains.  os.walk
@@ -414,7 +415,7 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
                     walk_into = not is_symlink
 
                 if walk_into:
-                    yield from walk(entry.path, topdown, onerror, followlinks)
+                    walk_dirs.append(entry.path)
 
     # Yield before recursion if going top down
     if topdown:
@@ -431,6 +432,9 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
             if followlinks or not islink(new_path):
                 yield from walk(new_path, topdown, onerror, followlinks)
     else:
+        # Recurse into sub-directories
+        for new_path in walk_dirs:
+            yield from walk(new_path, topdown, onerror, followlinks)
         # Yield after recursion if going bottom up
         yield top, dirs, nondirs
 
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -179,6 +179,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #25995: os.walk() no longer uses FDs proportional to the tree depth.
+
 - Issue #25994: Added the close() method and the support of the context manager
   protocol for the os.scandir() iterator.
 
