diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-04-16 23:19:11 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-04-16 23:19:11 (GMT) |
| commit | 0ff8a505c6ae5bcca275bf04e5738e99fd6ec96d (patch) | |
| tree | 1152ac33fed229b3f644f58852086d2adc5b3f08 /Lib/test/test_bytes.py | |
| parent | 466e9266d1fb057219624f8adb0d6872d9cc0b18 (diff) | |
| download | cpython-0ff8a505c6ae5bcca275bf04e5738e99fd6ec96d.zip cpython-0ff8a505c6ae5bcca275bf04e5738e99fd6ec96d.tar.gz cpython-0ff8a505c6ae5bcca275bf04e5738e99fd6ec96d.tar.bz2 | |
Merged revisions 80125,80128,80130 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r80125 | benjamin.peterson | 2010-04-16 17:35:32 -0500 (Fri, 16 Apr 2010) | 13 lines
Merged revisions 80123-80124 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80123 | benjamin.peterson | 2010-04-16 17:24:16 -0500 (Fri, 16 Apr 2010) | 1 line
bytearray -> type2test
........
r80124 | benjamin.peterson | 2010-04-16 17:25:57 -0500 (Fri, 16 Apr 2010) | 1 line
fix typo
........
................
r80128 | benjamin.peterson | 2010-04-16 17:51:37 -0500 (Fri, 16 Apr 2010) | 9 lines
Merged revisions 80126 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80126 | benjamin.peterson | 2010-04-16 17:35:38 -0500 (Fri, 16 Apr 2010) | 1 line
have a clear error when passing something > sys.maxsize to bytearray
........
................
r80130 | benjamin.peterson | 2010-04-16 18:00:53 -0500 (Fri, 16 Apr 2010) | 9 lines
Merged revisions 80129 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80129 | benjamin.peterson | 2010-04-16 17:52:44 -0500 (Fri, 16 Apr 2010) | 1 line
tiny simplification
........
................
Diffstat (limited to 'Lib/test/test_bytes.py')
| -rw-r--r-- | Lib/test/test_bytes.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index b83a83f..28ae5ca 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -63,17 +63,18 @@ class BaseBytesTest(unittest.TestCase): b = self.type2test([Indexable(), Indexable(1), Indexable(254), Indexable(255)]) self.assertEqual(list(b), [0, 1, 254, 255]) - self.assertRaises(ValueError, bytearray, [Indexable(-1)]) - self.assertRaises(ValueError, bytearray, [Indexable(256)]) + self.assertRaises(ValueError, self.type2test, [Indexable(-1)]) + self.assertRaises(ValueError, self.type2test, [Indexable(256)]) def test_from_ssize(self): - self.assertEqual(bytearray(0), b'') - self.assertEqual(bytearray(1), b'\x00') - self.assertEqual(bytearray(5), b'\x00\x00\x00\x00\x00') - self.assertRaises(ValueError, bytearray, -1) - - self.assertEqual(bytearray('0', 'ascii'), b'0') - self.assertEqual(bytearray(b'0'), b'0') + self.assertEqual(self.type2test(0), b'') + self.assertEqual(self.type2test(1), b'\x00') + self.assertEqual(self.type2test(5), b'\x00\x00\x00\x00\x00') + self.assertRaises(ValueError, self.type2test, -1) + + self.assertEqual(self.type2test('0', 'ascii'), b'0') + self.assertEqual(self.type2test(b'0'), b'0') + self.assertRaises(OverflowError, self.type2test, sys.maxsize + 1) def test_constructor_type_errors(self): self.assertRaises(TypeError, self.type2test, 0.0) |