diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-04-16 22:43:53 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-04-16 22:43:53 (GMT) |
| commit | c218ce86c4aec619b532076e6c496bd3febd088c (patch) | |
| tree | 825ef380ae7425d4f279439792470ddc75a037f7 /Lib | |
| parent | 58a7f75d054fe5e2306a704fc8257b4cf6f99faf (diff) | |
| download | cpython-c218ce86c4aec619b532076e6c496bd3febd088c.zip cpython-c218ce86c4aec619b532076e6c496bd3febd088c.tar.gz cpython-c218ce86c4aec619b532076e6c496bd3febd088c.tar.bz2 | |
Merged revisions 80123-80124,80126 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
........
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
........
Diffstat (limited to 'Lib')
| -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 85d5e03..a699d91 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -62,17 +62,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) |