[Python-checkins] cpython (merge 3.3 -> default): #17809: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/489f075430de
changeset:   83696:489f075430de
parent:      83694:1c6a1427353b
parent:      83695:dee0a2dea11e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu May 09 15:24:30 2013 +0300
summary:
  #17809: merge with 3.3.

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


diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -261,7 +261,8 @@
                 # expanduser should fall back to using the password database
                 del env['HOME']
                 home = pwd.getpwuid(os.getuid()).pw_dir
-                self.assertEqual(posixpath.expanduser("~"), home)
+                # $HOME can end with a trailing /, so strip it (see #17809)
+                self.assertEqual(posixpath.expanduser("~"), home.rstrip("/"))
 
     def test_normpath(self):
         self.assertEqual(posixpath.normpath(""), ".")
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -660,6 +660,7 @@
 Lenny Kneler
 Pat Knight
 Jeff Knupp
+Kubilay Kocak
 Greg Kochanski
 Damon Kohler
 Marko Kohtala

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