changeset: 83695:dee0a2dea11e branch: 3.3 parent: 83693:9ed127d8ad61 user: Ezio Melotti date: Thu May 09 15:19:45 2013 +0300 files: Lib/test/test_posixpath.py Misc/ACKS description: #17809: fix a test failure in test_expanduser when $HOME has a trailing /. Patch by Kubilay Kocak. diff -r 9ed127d8ad61 -r dee0a2dea11e Lib/test/test_posixpath.py --- a/Lib/test/test_posixpath.py Thu May 09 14:22:26 2013 +0300 +++ b/Lib/test/test_posixpath.py Thu May 09 15:19:45 2013 +0300 @@ -318,7 +318,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 -r 9ed127d8ad61 -r dee0a2dea11e Misc/ACKS --- a/Misc/ACKS Thu May 09 14:22:26 2013 +0300 +++ b/Misc/ACKS Thu May 09 15:19:45 2013 +0300 @@ -648,6 +648,7 @@ Lenny Kneler Pat Knight Jeff Knupp +Kubilay Kocak Greg Kochanski Damon Kohler Marko Kohtala