Author: georg.brandl Date: Sat Sep 30 11:13:25 2006 New Revision: 52066 Modified: python/branches/release24-maint/Lib/posixpath.py python/branches/release24-maint/Misc/NEWS Log: Bug #1566602: correct failure of posixpath unittest when $HOME ends with a slash. (backport from rev. 52065) Modified: python/branches/release24-maint/Lib/posixpath.py ============================================================================== --- python/branches/release24-maint/Lib/posixpath.py (original) +++ python/branches/release24-maint/Lib/posixpath.py Sat Sep 30 11:13:25 2006 @@ -328,8 +328,7 @@ except KeyError: return path userhome = pwent.pw_dir - if userhome.endswith('/'): - i += 1 + userhome = userhome.rstrip('/') return userhome + path[i:] Modified: python/branches/release24-maint/Misc/NEWS ============================================================================== --- python/branches/release24-maint/Misc/NEWS (original) +++ python/branches/release24-maint/Misc/NEWS Sat Sep 30 11:13:25 2006 @@ -119,6 +119,9 @@ Library ------- +- Bug #1566602: correct failure of posixpath unittest when $HOME ends + with a slash. + - Reverted patch #1504333 because it introduced an infinite loop. - Fix missing import of the types module in logging.config.