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:
Ezio Melotti 2010-01-24 19:26:24 +00:00
parent f41d29a8eb
commit e96159335f
52 changed files with 287 additions and 288 deletions

View file

@ -623,7 +623,7 @@ class CBytesIOTest(PyBytesIOTest):
state = memio.__getstate__()
self.assertEqual(len(state), 3)
bytearray(state[0]) # Check if state[0] supports the buffer interface.
self.assert_(isinstance(state[1], int))
self.assertIsInstance(state[1], int)
self.assert_(isinstance(state[2], dict) or state[2] is None)
memio.close()
self.assertRaises(ValueError, memio.__getstate__)
@ -667,9 +667,9 @@ class CStringIOTest(PyStringIOTest):
memio = self.ioclass()
state = memio.__getstate__()
self.assertEqual(len(state), 4)
self.assert_(isinstance(state[0], str))
self.assert_(isinstance(state[1], str))
self.assert_(isinstance(state[2], int))
self.assertIsInstance(state[0], str)
self.assertIsInstance(state[1], str)
self.assertIsInstance(state[2], int)
self.assert_(isinstance(state[3], dict) or state[3] is None)
memio.close()
self.assertRaises(ValueError, memio.__getstate__)