merge heads

Lib/test/test_os.py

@@ -695,6 +695,7 @@ class WalkTests(unittest.TestCase):
         #     flipped:  TESTFN, SUB2, SUB1, SUB11
         flipped = all[0][1][0] != "SUB1"
         all[0][1].sort()
+        all[3 - 2 * flipped][-1].sort()
         self.assertEqual(all[0], (walk_path, ["SUB1", "SUB2"], ["tmp1"]))
         self.assertEqual(all[1 + flipped], (sub1_path, ["SUB11"], ["tmp2"]))
         self.assertEqual(all[2 + flipped], (sub11_path, [], []))

Misc/NEWS

@@ -31,12 +31,12 @@ Core and Builtins
 Library
 -------
 
-- Issue 14773: Fix os.fwalk() failing on dangling symlinks.
+- Issue #14773: Fix os.fwalk() failing on dangling symlinks.
 
 - Issue #12541: Be lenient with quotes around Realm field of HTTP Basic
   Authentation in urllib2.
 
-- Issue 14807: move undocumented tarfile.filemode() to stat.filemode() and add
+- Issue #14807: move undocumented tarfile.filemode() to stat.filemode() and add
   doc entry. Add tarfile.filemode alias with deprecation warning.
 
 - Issue #13815: TarFile.extractfile() now returns io.BufferedReader objects.