[Python-checkins] cpython (merge default -> default): Merged upstream changes.

Mon Feb 20 19:51:13 CET 2012

http://hg.python.org/cpython/rev/d64f04e437b1
changeset: 75065:d64f04e437b1
parent: 75064:ae960e5ae112
parent: 75060:2e54fd523412
user: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: Mon Feb 20 18:51:00 2012 +0000
summary:
 Merged upstream changes.
files:
 Lib/test/test_base64.py | 2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py
--- a/Lib/test/test_base64.py
+++ b/Lib/test/test_base64.py
@@ -166,6 +166,7 @@
 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 @@
 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):
-- 
Repository URL: http://hg.python.org/cpython
