summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2006-09-30 09:13:21 (GMT)
committerGeorg Brandl <georg@python.org>2006-09-30 09:13:21 (GMT)
commit8d1e5bffc1249cdb5a8ced25e6f89328e7366290 (patch)
tree81d831f699acb2bec8384512ec459df44cf2fbd1
parentfb25773862343f19d0b15209697f88122c11a63f (diff)
downloadcpython-8d1e5bffc1249cdb5a8ced25e6f89328e7366290.zip
cpython-8d1e5bffc1249cdb5a8ced25e6f89328e7366290.tar.gz
cpython-8d1e5bffc1249cdb5a8ced25e6f89328e7366290.tar.bz2
Bug #1566602: correct failure of posixpath unittest when $HOME ends
with a slash.
-rw-r--r--Lib/posixpath.py3
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 2 deletions
diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index 9dd0e90..07ab4b6 100644
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -259,8 +259,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 4acce5c..6d048cc 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -63,6 +63,9 @@ Core and builtins
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.