merge heads

Lib/os.py

@@ -353,13 +353,23 @@ if _exists("openat"):
         names = flistdir(topfd)
         dirs, nondirs = [], []
         for name in names:
+            try:
                 # Here, we don't use AT_SYMLINK_NOFOLLOW to be consistent with
-            # walk() which reports symlinks to directories as directories. We do
+                # walk() which reports symlinks to directories as directories.
-            # however check for symlinks before recursing into a subdirectory.
+                # We do however check for symlinks before recursing into
+                # a subdirectory.
                 if st.S_ISDIR(fstatat(topfd, name).st_mode):
                     dirs.append(name)
                 else:
                     nondirs.append(name)
+            except FileNotFoundError:
+                try:
+                    # Add dangling symlinks, ignore disappeared files
+                    if st.S_ISLNK(fstatat(topfd, name, AT_SYMLINK_NOFOLLOW)
+                                .st_mode):
+                        nondirs.append(name)
+                except FileNotFoundError:
+                    continue
 
         if topdown:
             yield toppath, dirs, nondirs, topfd

Lib/test/test_os.py

@@ -651,6 +651,7 @@ class WalkTests(unittest.TestCase):
         #         SUB2/             a file kid and a dirsymlink kid
         #           tmp3
         #           link/           a symlink to TESTFN.2
+        #           broken_link
         #       TEST2/
         #         tmp4              a lone file
         walk_path = join(support.TESTFN, "TEST1")
@@ -663,6 +664,8 @@ class WalkTests(unittest.TestCase):
         link_path = join(sub2_path, "link")
         t2_path = join(support.TESTFN, "TEST2")
         tmp4_path = join(support.TESTFN, "TEST2", "tmp4")
+        link_path = join(sub2_path, "link")
+        broken_link_path = join(sub2_path, "broken_link")
 
         # Create stuff.
         os.makedirs(sub11_path)
@@ -679,7 +682,8 @@ class WalkTests(unittest.TestCase):
             else:
                 symlink_to_dir = os.symlink
             symlink_to_dir(os.path.abspath(t2_path), link_path)
-            sub2_tree = (sub2_path, ["link"], ["tmp3"])
+            symlink_to_dir('broken', broken_link_path)
+            sub2_tree = (sub2_path, ["link"], ["broken_link", "tmp3"])
         else:
             sub2_tree = (sub2_path, [], ["tmp3"])
 

Misc/NEWS

@@ -31,6 +31,8 @@ Core and Builtins
 Library
 -------
 
+- Issue 14773: Fix os.fwalk() failing on dangling symlinks.
+
 - Issue #12541: Be lenient with quotes around Realm field of HTTP Basic
   Authentation in urllib2.