diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/email/test/test_email.py | 16 | ||||
| -rwxr-xr-x | Lib/test/test_binascii.py | 12 | ||||
| -rw-r--r-- | Lib/test/test_descr.py | 16 | ||||
| -rw-r--r-- | Lib/test/test_zlib.py | 4 |
4 files changed, 24 insertions, 24 deletions
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index 9639d30..8857e42 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -2279,7 +2279,7 @@ Foo eq(charsets[0], 'utf-8') charset = Charset(charsets[0]) eq(charset.get_body_encoding(), 'base64') - msg.set_payload('hello world', charset=charset) + msg.set_payload(b'hello world', charset=charset) eq(msg.get_payload(), 'aGVsbG8gd29ybGQ=\n') eq(msg.get_payload(decode=True), b'hello world') eq(msg['content-transfer-encoding'], 'base64') @@ -2539,7 +2539,7 @@ class TestBase64(unittest.TestCase): def test_len(self): eq = self.assertEqual eq(base64mime.header_length('hello'), - len(base64mime.body_encode('hello', eol=''))) + len(base64mime.body_encode(b'hello', eol=''))) for size in range(15): if size == 0 : bsize = 0 elif size <= 3 : bsize = 4 @@ -2556,19 +2556,19 @@ class TestBase64(unittest.TestCase): def test_encode(self): eq = self.assertEqual - eq(base64mime.body_encode(''), '') - eq(base64mime.body_encode('hello'), 'aGVsbG8=\n') + eq(base64mime.body_encode(b''), b'') + eq(base64mime.body_encode(b'hello'), 'aGVsbG8=\n') # Test the binary flag - eq(base64mime.body_encode('hello\n'), 'aGVsbG8K\n') + eq(base64mime.body_encode(b'hello\n'), 'aGVsbG8K\n') # Test the maxlinelen arg - eq(base64mime.body_encode('xxxx ' * 20, maxlinelen=40), """\ + eq(base64mime.body_encode(b'xxxx ' * 20, maxlinelen=40), """\ eHh4eCB4eHh4IHh4eHggeHh4eCB4eHh4IHh4eHgg eHh4eCB4eHh4IHh4eHggeHh4eCB4eHh4IHh4eHgg eHh4eCB4eHh4IHh4eHggeHh4eCB4eHh4IHh4eHgg eHh4eCB4eHh4IA== """) # Test the eol argument - eq(base64mime.body_encode('xxxx ' * 20, maxlinelen=40, eol='\r\n'), + eq(base64mime.body_encode(b'xxxx ' * 20, maxlinelen=40, eol='\r\n'), """\ eHh4eCB4eHh4IHh4eHggeHh4eCB4eHh4IHh4eHgg\r eHh4eCB4eHh4IHh4eHggeHh4eCB4eHh4IHh4eHgg\r @@ -2734,7 +2734,7 @@ class TestCharset(unittest.TestCase): eq('hello w=F6rld', c.body_encode('hello w\xf6rld')) # Try a charset with Base64 body encoding c = Charset('utf-8') - eq('aGVsbG8gd29ybGQ=\n', c.body_encode('hello world')) + eq('aGVsbG8gd29ybGQ=\n', c.body_encode(b'hello world')) # Try a charset with None body encoding c = Charset('us-ascii') eq('hello world', c.body_encode('hello world')) diff --git a/Lib/test/test_binascii.py b/Lib/test/test_binascii.py index 76a76b2..d4ab6bf 100755 --- a/Lib/test/test_binascii.py +++ b/Lib/test/test_binascii.py @@ -121,7 +121,7 @@ class BinASCIITest(unittest.TestCase): self.assertRaises(binascii.Error, binascii.a2b_hex, t[:-1]) self.assertRaises(binascii.Error, binascii.a2b_hex, t[:-1] + b'q') - self.assertEqual(binascii.hexlify('a'), b'61') + self.assertEqual(binascii.hexlify(b'a'), b'61') def test_qp(self): # A test for SF bug 534347 (segfaults without the proper fix) @@ -166,7 +166,15 @@ class BinASCIITest(unittest.TestCase): f(b'') except SystemError as err: self.fail("%s(b'') raises SystemError: %s" % (n, err)) - binascii.crc_hqx('', 0) + binascii.crc_hqx(b'', 0) + + def test_no_binary_strings(self): + # b2a_ must not accept strings + for f in (binascii.b2a_uu, binascii.b2a_base64, + binascii.b2a_hqx, binascii.b2a_qp, + binascii.hexlify, binascii.rlecode_hqx, + binascii.crc_hqx, binascii.crc32): + self.assertRaises(TypeError, f, "test") def test_main(): support.run_unittest(BinASCIITest) diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index fa3e0c3..1020740 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -3097,22 +3097,14 @@ order (MRO) for bases """ import binascii # SF bug [#470040] ParseTuple t# vs subclasses. - class MyStr(str): + class MyBytes(bytes): pass - base = 'abc' - m = MyStr(base) + base = b'abc' + m = MyBytes(base) # b2a_hex uses the buffer interface to get its argument's value, via # PyArg_ParseTuple 't#' code. self.assertEqual(binascii.b2a_hex(m), binascii.b2a_hex(base)) - # It's not clear that unicode will continue to support the character - # buffer interface, and this test will fail if that's taken away. - class MyUni(str): - pass - base = 'abc' - m = MyUni(base) - self.assertEqual(binascii.b2a_hex(m), binascii.b2a_hex(base)) - class MyInt(int): pass m = MyInt(42) @@ -3129,7 +3121,7 @@ order (MRO) for bases """ class octetstring(str): def __str__(self): - return binascii.b2a_hex(self).decode("ascii") + return binascii.b2a_hex(self.encode('ascii')).decode("ascii") def __repr__(self): return self + " repr" diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py index f52aa5e..99c8dda 100644 --- a/Lib/test/test_zlib.py +++ b/Lib/test/test_zlib.py @@ -48,11 +48,11 @@ class ChecksumTestCase(unittest.TestCase): self.assertEqual(zlib.adler32('spam'), 72286642) def test_same_as_binascii_crc32(self): - foo = 'abcdefghijklmnop' + foo = b'abcdefghijklmnop' crc = 2486878355 self.assertEqual(binascii.crc32(foo), crc) self.assertEqual(zlib.crc32(foo), crc) - self.assertEqual(binascii.crc32('spam'), zlib.crc32('spam')) + self.assertEqual(binascii.crc32(b'spam'), zlib.crc32(b'spam')) |