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
........
diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py
index 6ab8328..9777631 100644
--- a/Lib/test/test_memoryio.py
+++ b/Lib/test/test_memoryio.py
@@ -623,7 +623,7 @@
         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 @@
         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__)