diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2012-05-15 16:07:24 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2012-05-15 16:07:24 (GMT) |
| commit | c5f31ed63d7db6f7e13112790d15a6274ca7c2cf (patch) | |
| tree | 3ea639f421154a61af72ecb5aa4d497864a50509 | |
| parent | 92a5bf0c0aae607da90bb08a01b7d06c4c8b45fe (diff) | |
| parent | c96f5a0457caea1757acdbac8626559542242b8c (diff) | |
| download | cpython-c5f31ed63d7db6f7e13112790d15a6274ca7c2cf.zip cpython-c5f31ed63d7db6f7e13112790d15a6274ca7c2cf.tar.gz cpython-c5f31ed63d7db6f7e13112790d15a6274ca7c2cf.tar.bz2 | |
merge heads
| -rw-r--r-- | Lib/test/test_os.py | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 1e0daf0..9a84ba1 100644 --- a/Lib/test/test_os.py +++ b/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, [], [])) @@ -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. |