Bug #1566602: correct failure of posixpath unittest when $HOME ends

with a slash. (backport from rev. 52065)

Bug #1566602: correct failure of posixpath unittest when $HOME ends
with a slash. (backport from rev. 52065)
9c9a9ab6 · Georg Brandl · ad4e11e1 · 9c9a9ab6 · 9c9a9ab6
Commit 9c9a9ab6 authored Sep 30, 2006 by Georg Brandl
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Lib/posixpath.py Lib/posixpath.py +1 -2

Misc/NEWS Misc/NEWS +3 -0

No files found.
--- 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:]



--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -41,6 +41,9 @@ Extension Modules
 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.