summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2012-02-20 18:51:00 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2012-02-20 18:51:00 (GMT)
commit3443fe60c7e0a232fb383a5a2e5c4156562bbc14 (patch)
tree2ec345f06d055276dc0b72b5478552e515a82dc0
parent5743691b878b03352f4473d862c656b3de442bcf (diff)
parentdff46faa955157d19ed70e10d1ce1cbfd660c14f (diff)
downloadcpython-3443fe60c7e0a232fb383a5a2e5c4156562bbc14.zip
cpython-3443fe60c7e0a232fb383a5a2e5c4156562bbc14.tar.gz
cpython-3443fe60c7e0a232fb383a5a2e5c4156562bbc14.tar.bz2
Merged upstream changes.
-rw-r--r--Lib/test/test_base64.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py
index 5744af4..b02f86d 100644
--- a/Lib/test/test_base64.py
+++ b/Lib/test/test_base64.py
@@ -166,6 +166,7 @@ class BaseXYTestCase(unittest.TestCase):
self.assertEqual(base64.b64decode(bstr.decode('ascii')), res)
with self.assertRaises(binascii.Error):
base64.b64decode(bstr, validate=True)
+ with self.assertRaises(binascii.Error):
base64.b64decode(bstr.decode('ascii'), validate=True)
def test_b32encode(self):
@@ -236,6 +237,7 @@ class BaseXYTestCase(unittest.TestCase):
for data in [b'abc', b'ABCDEF==']:
with self.assertRaises(binascii.Error):
base64.b32decode(data)
+ with self.assertRaises(binascii.Error):
base64.b32decode(data.decode('ascii'))
def test_b16encode(self):