commit 79ec9f0ec970c50325d68820d08b40d540cde6f9
author Ezio Melotti <ezio.melotti@gmail.com> Thu May 09 15:24:30 2013 +0300
committer Ezio Melotti <ezio.melotti@gmail.com> Thu May 09 15:24:30 2013 +0300
tree cc9e164a417aa56795ea6fec60c7b42388198c2f
parent b3c5d8568030842c6fbd30a6f197c8b684e0ccc6
parent ce82d57c7480c7360539c9e606d0b2f620e0c181

#17809: merge with 3.3.

Lib/test/test_posixpath.py

diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 1f05050..412849c 100644
--- 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(""), ".")

Misc/ACKS

diff --git a/Misc/ACKS b/Misc/ACKS
index c79e21c..5f5b84b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -660,6 +660,7 @@
 Lenny Kneler
 Pat Knight
 Jeff Knupp
+Kubilay Kocak
 Greg Kochanski
 Damon Kohler
 Marko Kohtala