mirror of https://github.com/python/cpython
Use find() instead of looping over the string in expanduser().
From SF patch #757058.
This commit is contained in:
parent
76ca1d428f
commit
a9da5ae07a
|
@ -303,11 +303,11 @@ def expanduser(path):
|
|||
do nothing."""
|
||||
if not path.startswith('~'):
|
||||
return path
|
||||
i, n = 1, len(path)
|
||||
while i < n and path[i] != '/':
|
||||
i += 1
|
||||
i = path.find('/', 1)
|
||||
if i < 0:
|
||||
i = len(path)
|
||||
if i == 1:
|
||||
if not 'HOME' in os.environ:
|
||||
if 'HOME' not in os.environ:
|
||||
import pwd
|
||||
userhome = pwd.getpwuid(os.getuid()).pw_dir
|
||||
else:
|
||||
|
|
|
@ -332,12 +332,16 @@ class PosixPathTest(unittest.TestCase):
|
|||
|
||||
def test_expanduser(self):
|
||||
self.assertEqual(posixpath.expanduser("foo"), "foo")
|
||||
self.assert_(isinstance(posixpath.expanduser("~/"), basestring))
|
||||
try:
|
||||
import pwd
|
||||
except ImportError:
|
||||
pass
|
||||
else:
|
||||
self.assert_(isinstance(posixpath.expanduser("~/"), basestring))
|
||||
self.assertEqual(
|
||||
posixpath.expanduser("~") + "/",
|
||||
posixpath.expanduser("~/")
|
||||
)
|
||||
self.assert_(isinstance(posixpath.expanduser("~root/"), basestring))
|
||||
self.assert_(isinstance(posixpath.expanduser("~foo/"), basestring))
|
||||
|
||||
|
|
Loading…
Reference in New Issue