Bug #1566602: correct failure of posixpath unittest when $HOME ends
with a slash.
 (backport from rev. 52065)
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 @@
         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 6f6d0a4..56e0e2b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -41,6 +41,9 @@
 Library
 -------
 
+- Bug #1566602: correct failure of posixpath unittest when $HOME ends
+  with a slash.
+
 - Bug #1565661: in webbrowser, split() the command for the default
   GNOME browser in case it is a command with args.