summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_memoryio.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-01-24 19:26:24 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-01-24 19:26:24 (GMT)
commite96159335f6bb26615b57f880bf90440ed0123e4 (patch)
tree273325221fdef15629ebc63287c4772a3af40879 /Lib/test/test_memoryio.py
parentf41d29a8ebc27aafc18b6850648f1faa918e0e5d (diff)
downloadcpython-e96159335f6bb26615b57f880bf90440ed0123e4.zip
cpython-e96159335f6bb26615b57f880bf90440ed0123e4.tar.gz
cpython-e96159335f6bb26615b57f880bf90440ed0123e4.tar.bz2
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 ........
Diffstat (limited to 'Lib/test/test_memoryio.py')
-rw-r--r--Lib/test/test_memoryio.py8
1 files changed, 4 insertions, 4 deletions
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 @@ 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__)