diff options
Diffstat (limited to 'Lib/test/test_binascii.py')
| -rw-r--r-- | Lib/test/test_binascii.py | 130 |
1 files changed, 68 insertions, 62 deletions
diff --git a/Lib/test/test_binascii.py b/Lib/test/test_binascii.py index f825f1c..1e9e888 100644 --- a/Lib/test/test_binascii.py +++ b/Lib/test/test_binascii.py @@ -1,6 +1,6 @@ """Test the binascii C module.""" -from test import test_support +from test import support import unittest import binascii import array @@ -15,12 +15,12 @@ all_functions = a2b_functions + b2a_functions + ['crc32', 'crc_hqx'] class BinASCIITest(unittest.TestCase): - type2test = str + type2test = bytes # Create binary test data - rawdata = "The quick brown fox jumps over the lazy dog.\r\n" + rawdata = b"The quick brown fox jumps over the lazy dog.\r\n" # Be slow so we don't depend on other modules - rawdata += "".join(map(chr, xrange(256))) - rawdata += "\r\nHello world.\n" + rawdata += bytes(range(256)) + rawdata += b"\r\nHello world.\n" def setUp(self): self.data = self.type2test(self.rawdata) @@ -46,16 +46,16 @@ class BinASCIITest(unittest.TestCase): try: a = b2a(self.type2test(raw)) res = a2b(self.type2test(a)) - except Exception, err: + except Exception as err: self.fail("{}/{} conversion raises {!r}".format(fb, fa, err)) if fb == 'b2a_hqx': # b2a_hqx returns a tuple res, _ = res self.assertEqual(res, raw, "{}/{} conversion: " "{!r} != {!r}".format(fb, fa, res, raw)) - self.assertIsInstance(res, str) - self.assertIsInstance(a, str) - self.assertLess(max(ord(c) for c in a), 128) + self.assertIsInstance(res, bytes) + self.assertIsInstance(a, bytes) + self.assertLess(max(a), 128) self.assertIsInstance(binascii.crc_hqx(raw, 0), int) self.assertIsInstance(binascii.crc32(raw), int) @@ -67,11 +67,11 @@ class BinASCIITest(unittest.TestCase): b = self.type2test(self.rawdata[i:i+MAX_BASE64]) a = binascii.b2a_base64(b) lines.append(a) - res = "" + res = bytes() for line in lines: a = self.type2test(line) b = binascii.a2b_base64(a) - res = res + b + res += b self.assertEqual(res, self.rawdata) def test_base64invalid(self): @@ -84,24 +84,23 @@ class BinASCIITest(unittest.TestCase): a = binascii.b2a_base64(b) lines.append(a) - fillers = "" - valid = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+/" - for i in xrange(256): - c = chr(i) - if c not in valid: - fillers += c + fillers = bytearray() + valid = b"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+/" + for i in range(256): + if i not in valid: + fillers.append(i) def addnoise(line): noise = fillers ratio = len(line) // len(noise) - res = "" + res = bytearray() while line and noise: if len(line) // len(noise) > ratio: c, line = line[0], line[1:] else: c, noise = noise[0], noise[1:] - res += c + res.append(c) return res + noise + line - res = "" + res = bytearray() for line in map(addnoise, lines): a = self.type2test(line) b = binascii.a2b_base64(a) @@ -110,7 +109,7 @@ class BinASCIITest(unittest.TestCase): # Test base64 with just invalid characters, which should return # empty strings. TBD: shouldn't it raise an exception instead ? - self.assertEqual(binascii.a2b_base64(self.type2test(fillers)), '') + self.assertEqual(binascii.a2b_base64(self.type2test(fillers)), b'') def test_uu(self): MAX_UU = 45 @@ -119,27 +118,27 @@ class BinASCIITest(unittest.TestCase): b = self.type2test(self.rawdata[i:i+MAX_UU]) a = binascii.b2a_uu(b) lines.append(a) - res = "" + res = bytes() for line in lines: a = self.type2test(line) b = binascii.a2b_uu(a) res += b self.assertEqual(res, self.rawdata) - self.assertEqual(binascii.a2b_uu("\x7f"), "\x00"*31) - self.assertEqual(binascii.a2b_uu("\x80"), "\x00"*32) - self.assertEqual(binascii.a2b_uu("\xff"), "\x00"*31) - self.assertRaises(binascii.Error, binascii.a2b_uu, "\xff\x00") - self.assertRaises(binascii.Error, binascii.a2b_uu, "!!!!") + self.assertEqual(binascii.a2b_uu(b"\x7f"), b"\x00"*31) + self.assertEqual(binascii.a2b_uu(b"\x80"), b"\x00"*32) + self.assertEqual(binascii.a2b_uu(b"\xff"), b"\x00"*31) + self.assertRaises(binascii.Error, binascii.a2b_uu, b"\xff\x00") + self.assertRaises(binascii.Error, binascii.a2b_uu, b"!!!!") - self.assertRaises(binascii.Error, binascii.b2a_uu, 46*"!") + self.assertRaises(binascii.Error, binascii.b2a_uu, 46*b"!") # Issue #7701 (crash on a pydebug build) - self.assertEqual(binascii.b2a_uu('x'), '!> \n') + self.assertEqual(binascii.b2a_uu(b'x'), b'!> \n') def test_crc32(self): - crc = binascii.crc32(self.type2test("Test the CRC-32 of")) - crc = binascii.crc32(self.type2test(" this string."), crc) + crc = binascii.crc32(self.type2test(b"Test the CRC-32 of")) + crc = binascii.crc32(self.type2test(b" this string."), crc) self.assertEqual(crc, 1571220330) self.assertRaises(TypeError, binascii.crc32) @@ -156,51 +155,48 @@ class BinASCIITest(unittest.TestCase): def test_hex(self): # test hexlification - s = '{s\005\000\000\000worldi\002\000\000\000s\005\000\000\000helloi\001\000\000\0000' + s = b'{s\005\000\000\000worldi\002\000\000\000s\005\000\000\000helloi\001\000\000\0000' t = binascii.b2a_hex(self.type2test(s)) u = binascii.a2b_hex(self.type2test(t)) self.assertEqual(s, u) - self.assertRaises(TypeError, binascii.a2b_hex, t[:-1]) - self.assertRaises(TypeError, binascii.a2b_hex, t[:-1] + 'q') + self.assertRaises(binascii.Error, binascii.a2b_hex, t[:-1]) + self.assertRaises(binascii.Error, binascii.a2b_hex, t[:-1] + b'q') - # Verify the treatment of Unicode strings - if test_support.have_unicode: - self.assertEqual(binascii.hexlify(unicode('a', 'ascii')), '61') + self.assertEqual(binascii.hexlify(b'a'), b'61') def test_qp(self): # A test for SF bug 534347 (segfaults without the proper fix) try: - binascii.a2b_qp("", **{1:1}) + binascii.a2b_qp(b"", **{1:1}) except TypeError: pass else: self.fail("binascii.a2b_qp(**{1:1}) didn't raise TypeError") - self.assertEqual(binascii.a2b_qp("= "), "= ") - self.assertEqual(binascii.a2b_qp("=="), "=") - self.assertEqual(binascii.a2b_qp("=AX"), "=AX") + self.assertEqual(binascii.a2b_qp(b"= "), b"= ") + self.assertEqual(binascii.a2b_qp(b"=="), b"=") + self.assertEqual(binascii.a2b_qp(b"=AX"), b"=AX") self.assertRaises(TypeError, binascii.b2a_qp, foo="bar") - self.assertEqual(binascii.a2b_qp("=00\r\n=00"), "\x00\r\n\x00") + self.assertEqual(binascii.a2b_qp(b"=00\r\n=00"), b"\x00\r\n\x00") self.assertEqual( - binascii.b2a_qp("\xff\r\n\xff\n\xff"), - "=FF\r\n=FF\r\n=FF" - ) + binascii.b2a_qp(b"\xff\r\n\xff\n\xff"), + b"=FF\r\n=FF\r\n=FF") self.assertEqual( - binascii.b2a_qp("0"*75+"\xff\r\n\xff\r\n\xff"), - "0"*75+"=\r\n=FF\r\n=FF\r\n=FF" - ) + binascii.b2a_qp(b"0"*75+b"\xff\r\n\xff\r\n\xff"), + b"0"*75+b"=\r\n=FF\r\n=FF\r\n=FF") - self.assertEqual(binascii.b2a_qp('\0\n'), '=00\n') - self.assertEqual(binascii.b2a_qp('\0\n', quotetabs=True), '=00\n') - self.assertEqual(binascii.b2a_qp('foo\tbar\t\n'), 'foo\tbar=09\n') - self.assertEqual(binascii.b2a_qp('foo\tbar\t\n', quotetabs=True), 'foo=09bar=09\n') + self.assertEqual(binascii.b2a_qp(b'\0\n'), b'=00\n') + self.assertEqual(binascii.b2a_qp(b'\0\n', quotetabs=True), b'=00\n') + self.assertEqual(binascii.b2a_qp(b'foo\tbar\t\n'), b'foo\tbar=09\n') + self.assertEqual(binascii.b2a_qp(b'foo\tbar\t\n', quotetabs=True), + b'foo=09bar=09\n') - self.assertEqual(binascii.b2a_qp('.'), '=2E') - self.assertEqual(binascii.b2a_qp('.\n'), '=2E\n') - self.assertEqual(binascii.b2a_qp('a.\n'), 'a.\n') + self.assertEqual(binascii.b2a_qp(b'.'), b'=2E') + self.assertEqual(binascii.b2a_qp(b'.\n'), b'=2E\n') + self.assertEqual(binascii.b2a_qp(b'a.\n'), b'a.\n') def test_empty_string(self): # A test for SF bug #1022953. Make sure SystemError is not raised. - empty = self.type2test('') + empty = self.type2test(b'') for func in all_functions: if func == 'crc_hqx': # crc_hqx needs 2 arguments @@ -209,13 +205,23 @@ class BinASCIITest(unittest.TestCase): f = getattr(binascii, func) try: f(empty) - except Exception, err: + except Exception as err: self.fail("{}({!r}) raises {!r}".format(func, empty, err)) + def test_unicode_strings(self): + # Unicode strings are not accepted. + for func in all_functions: + try: + self.assertRaises(TypeError, getattr(binascii, func), "test") + except Exception as err: + self.fail('{}("test") raises {!r}'.format(func, err)) + # crc_hqx needs 2 arguments + self.assertRaises(TypeError, binascii.crc_hqx, "test", 0) + class ArrayBinASCIITest(BinASCIITest): def type2test(self, s): - return array.array('c', s) + return array.array('B', list(s)) class BytearrayBinASCIITest(BinASCIITest): @@ -227,10 +233,10 @@ class MemoryviewBinASCIITest(BinASCIITest): def test_main(): - test_support.run_unittest(BinASCIITest, - ArrayBinASCIITest, - BytearrayBinASCIITest, - MemoryviewBinASCIITest) + support.run_unittest(BinASCIITest, + ArrayBinASCIITest, + BytearrayBinASCIITest, + MemoryviewBinASCIITest) if __name__ == "__main__": test_main() |