[Python-checkins] cpython (merge default -> default): merge heads

[senthil.kumaran]

http://hg.python.org/cpython/rev/54d63a86a876
changeset:   76961:54d63a86a876
parent:      76960:08fa1a47fa97
parent:      76957:cfb870c6bb8e
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Wed May 16 00:07:24 2012 +0800
summary:
  merge heads

files:
  Lib/test/test_os.py |  1 +
  Misc/NEWS           |  4 ++--
  2 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -695,6 +695,7 @@
         #     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, [], []))
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -31,12 +31,12 @@
 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.

-- 
Repository URL: http://hg.python.org/cpython