From 86b66b986492566cdd9a82b22e41a44446b38869 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 30 Sep 2006 09:13:25 +0000
Subject: Bug #1566602: correct failure of posixpath unittest when $HOME ends
 with a slash.  (backport from rev. 52065)

---
 Lib/posixpath.py | 3 +--
 Misc/NEWS        | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index 9eac6bc..b396f0a 100644
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -328,8 +328,7 @@ def expanduser(path):
         except KeyError:
             return path
         userhome = pwent.pw_dir
-    if userhome.endswith('/'):
-        i += 1
+    userhome = userhome.rstrip('/')
     return userhome + path[i:]
 
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 284825e..07be792 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -119,6 +119,9 @@ Extension Modules
 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.
-- 
cgit v0.12