Commit c5f31ed6 authored by Senthil Kumaran's avatar Senthil Kumaran

merge heads

parents 92a5bf0c c96f5a04
...@@ -695,6 +695,7 @@ class WalkTests(unittest.TestCase): ...@@ -695,6 +695,7 @@ class WalkTests(unittest.TestCase):
# flipped: TESTFN, SUB2, SUB1, SUB11 # flipped: TESTFN, SUB2, SUB1, SUB11
flipped = all[0][1][0] != "SUB1" flipped = all[0][1][0] != "SUB1"
all[0][1].sort() all[0][1].sort()
all[3 - 2 * flipped][-1].sort()
self.assertEqual(all[0], (walk_path, ["SUB1", "SUB2"], ["tmp1"])) self.assertEqual(all[0], (walk_path, ["SUB1", "SUB2"], ["tmp1"]))
self.assertEqual(all[1 + flipped], (sub1_path, ["SUB11"], ["tmp2"])) self.assertEqual(all[1 + flipped], (sub1_path, ["SUB11"], ["tmp2"]))
self.assertEqual(all[2 + flipped], (sub11_path, [], [])) self.assertEqual(all[2 + flipped], (sub11_path, [], []))
......
...@@ -31,12 +31,12 @@ Core and Builtins ...@@ -31,12 +31,12 @@ Core and Builtins
Library 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 - Issue #12541: Be lenient with quotes around Realm field of HTTP Basic
Authentation in urllib2. 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. doc entry. Add tarfile.filemode alias with deprecation warning.
- Issue #13815: TarFile.extractfile() now returns io.BufferedReader objects. - Issue #13815: TarFile.extractfile() now returns io.BufferedReader objects.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment