mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 07:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

#5471: fix expanduser() for $HOME set to "/".

Browse source
This commit is contained in:
Georg Brandl 2009-04-05 14:48:49 +00:00
parent a7ec0726e2
commit 3f0ef20269
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/posixpath.py
View file

@ -262,7 +262,7 @@ def expanduser(path):
except KeyError: except KeyError:
return path return path
userhome = pwent.pw_dir userhome = pwent.pw_dir
userhome = userhome.rstrip('/') userhome = userhome.rstrip('/') or userhome
return userhome + path[i:] return userhome + path[i:]

5
Lib/test/test_posixpath.py
View file

@ -345,6 +345,11 @@ class PosixPathTest(unittest.TestCase):
self.assert_(isinstance(posixpath.expanduser("~root/"), basestring)) self.assert_(isinstance(posixpath.expanduser("~root/"), basestring))
self.assert_(isinstance(posixpath.expanduser("~foo/"), basestring)) self.assert_(isinstance(posixpath.expanduser("~foo/"), basestring))
orig_home = os.environ['HOME']
os.environ['HOME'] = '/'
self.assertEqual(posixpath.expanduser("~"), "/")
os.environ['HOME'] = orig_home
self.assertRaises(TypeError, posixpath.expanduser) self.assertRaises(TypeError, posixpath.expanduser)
def test_expandvars(self): def test_expandvars(self):

2
Misc/NEWS
View file

@ -212,6 +212,8 @@ Core and Builtins
Library Library
------- -------
- Issue 5471: Fix os.path.expanduser() for $HOME set to '/'.
- Issue 1326077: fix the formatting of SyntaxErrors by the traceback module. - Issue 1326077: fix the formatting of SyntaxErrors by the traceback module.
- Issue 1726172: fix IndexError in the case of and empty response in ftplib. - Issue 1726172: fix IndexError in the case of and empty response in ftplib.