mirror of
https://github.com/python/cpython.git
synced 2025-08-31 05:58:33 +00:00
Merged revisions 77727 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77727 | ezio.melotti | 2010-01-24 18:58:36 +0200 (Sun, 24 Jan 2010) | 1 line use assert[Not]IsInstance where appropriate ........
This commit is contained in:
parent
f41d29a8eb
commit
e96159335f
52 changed files with 287 additions and 288 deletions
|
@ -402,8 +402,8 @@ class PosixPathTest(unittest.TestCase):
|
|||
except ImportError:
|
||||
pass
|
||||
else:
|
||||
self.assertTrue(isinstance(posixpath.expanduser("~/"), str))
|
||||
self.assertTrue(isinstance(posixpath.expanduser(b"~/"), bytes))
|
||||
self.assertIsInstance(posixpath.expanduser("~/"), str)
|
||||
self.assertIsInstance(posixpath.expanduser(b"~/"), bytes)
|
||||
# if home directory == root directory, this test makes no sense
|
||||
if posixpath.expanduser("~") != '/':
|
||||
self.assertEqual(
|
||||
|
@ -414,10 +414,10 @@ class PosixPathTest(unittest.TestCase):
|
|||
posixpath.expanduser(b"~") + b"/",
|
||||
posixpath.expanduser(b"~/")
|
||||
)
|
||||
self.assertTrue(isinstance(posixpath.expanduser("~root/"), str))
|
||||
self.assertTrue(isinstance(posixpath.expanduser("~foo/"), str))
|
||||
self.assertTrue(isinstance(posixpath.expanduser(b"~root/"), bytes))
|
||||
self.assertTrue(isinstance(posixpath.expanduser(b"~foo/"), bytes))
|
||||
self.assertIsInstance(posixpath.expanduser("~root/"), str)
|
||||
self.assertIsInstance(posixpath.expanduser("~foo/"), str)
|
||||
self.assertIsInstance(posixpath.expanduser(b"~root/"), bytes)
|
||||
self.assertIsInstance(posixpath.expanduser(b"~foo/"), bytes)
|
||||
|
||||
with support.EnvironmentVarGuard() as env:
|
||||
env['HOME'] = '/'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue