diff options
| author | Georg Brandl <georg@python.org> | 2006-09-30 09:13:25 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2006-09-30 09:13:25 +0000 |
| commit | 86b66b986492566cdd9a82b22e41a44446b38869 (patch) | |
| tree | 609c1bce5b9eb4d051453baf71e72f7786091121 | |
| parent | adf8a1d0cb146f91ceff8963bd4b95dbe015a89f (diff) | |
| download | cpython-git-86b66b986492566cdd9a82b22e41a44446b38869.tar.gz | |
Bug #1566602: correct failure of posixpath unittest when $HOME ends
with a slash.
(backport from rev. 52065)
| -rw-r--r-- | Lib/posixpath.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Lib/posixpath.py b/Lib/posixpath.py index 9eac6bc13e..b396f0ace5 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:] @@ -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. |