Merged upstream changes.

This commit is contained in:
Vinay Sajip 2012-02-20 18:51:00 +00:00
commit 3443fe60c7
1 changed files with 2 additions and 0 deletions

View File

@ -166,6 +166,7 @@ class BaseXYTestCase(unittest.TestCase):
self.assertEqual(base64.b64decode(bstr.decode('ascii')), res) self.assertEqual(base64.b64decode(bstr.decode('ascii')), res)
with self.assertRaises(binascii.Error): with self.assertRaises(binascii.Error):
base64.b64decode(bstr, validate=True) base64.b64decode(bstr, validate=True)
with self.assertRaises(binascii.Error):
base64.b64decode(bstr.decode('ascii'), validate=True) base64.b64decode(bstr.decode('ascii'), validate=True)
def test_b32encode(self): def test_b32encode(self):
@ -236,6 +237,7 @@ class BaseXYTestCase(unittest.TestCase):
for data in [b'abc', b'ABCDEF==']: for data in [b'abc', b'ABCDEF==']:
with self.assertRaises(binascii.Error): with self.assertRaises(binascii.Error):
base64.b32decode(data) base64.b32decode(data)
with self.assertRaises(binascii.Error):
base64.b32decode(data.decode('ascii')) base64.b32decode(data.decode('ascii'))
def test_b16encode(self): def test_b16encode(self):