https://github.com/python/cpython/commit/13360efd385d1a7d0659beba03787ea3d063ef9b
commit: 13360efd385d1a7d0659beba03787ea3d063ef9b
branch: main
author: Serhiy Storchaka <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2025-11-06T11:34:32+02:00
summary:
gh-125346: Add more base64 tests (GH-141061)
Add more tests for the altchars argument of b64decode() and for the map01
argument of b32decode().
files:
M Lib/test/test_base64.py
diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py
index 6b5c65a56d87a0..65977ca8c9f2e0 100644
--- a/Lib/test/test_base64.py
+++ b/Lib/test/test_base64.py
@@ -231,18 +231,6 @@ def test_b64decode(self):
self.check_other_types(base64.b64decode, b"YWJj", b"abc")
self.check_decode_type_errors(base64.b64decode)
- # Test with arbitrary alternative characters
- tests_altchars = {(b'01a*b$cd', b'*$'): b'\xd3V\xbeo\xf7\x1d',
- }
- for (data, altchars), res in tests_altchars.items():
- data_str = data.decode('ascii')
- altchars_str = altchars.decode('ascii')
-
- eq(base64.b64decode(data, altchars=altchars), res)
- eq(base64.b64decode(data_str, altchars=altchars), res)
- eq(base64.b64decode(data, altchars=altchars_str), res)
- eq(base64.b64decode(data_str, altchars=altchars_str), res)
-
# Test standard alphabet
for data, res in tests.items():
eq(base64.standard_b64decode(data), res)
@@ -263,6 +251,20 @@ def test_b64decode(self):
b'\xd3V\xbeo\xf7\x1d')
self.check_decode_type_errors(base64.urlsafe_b64decode)
+ def test_b64decode_altchars(self):
+ # Test with arbitrary alternative characters
+ eq = self.assertEqual
+ res = b'\xd3V\xbeo\xf7\x1d'
+ for altchars in b'*$', b'+/', b'/+', b'+_', b'-+', b'-/', b'/_':
+ data = b'01a%cb%ccd' % tuple(altchars)
+ data_str = data.decode('ascii')
+ altchars_str = altchars.decode('ascii')
+
+ eq(base64.b64decode(data, altchars=altchars), res)
+ eq(base64.b64decode(data_str, altchars=altchars), res)
+ eq(base64.b64decode(data, altchars=altchars_str), res)
+ eq(base64.b64decode(data_str, altchars=altchars_str), res)
+
def test_b64decode_padding_error(self):
self.assertRaises(binascii.Error, base64.b64decode, b'abc')
self.assertRaises(binascii.Error, base64.b64decode, 'abc')
@@ -295,10 +297,12 @@ def test_b64decode_invalid_chars(self):
base64.b64decode(bstr.decode('ascii'), validate=True)
# Normal alphabet characters not discarded when alternative given
- res = b'\xFB\xEF\xBE\xFF\xFF\xFF'
- self.assertEqual(base64.b64decode(b'++[[//]]', b'[]'), res)
- self.assertEqual(base64.urlsafe_b64decode(b'++--//__'), res)
-
+ res = b'\xfb\xef\xff'
+ self.assertEqual(base64.b64decode(b'++//', validate=True), res)
+ self.assertEqual(base64.b64decode(b'++//', '-_', validate=True), res)
+ self.assertEqual(base64.b64decode(b'--__', '-_', validate=True), res)
+ self.assertEqual(base64.urlsafe_b64decode(b'++//'), res)
+ self.assertEqual(base64.urlsafe_b64decode(b'--__'), res)
def _altchars_strategy():
"""Generate 'altchars' for base64 encoding."""
@@ -394,19 +398,33 @@ def test_b32decode_casefold(self):
eq(base64.b32decode(b'MLO23456'), b'b\xdd\xad\xf3\xbe')
eq(base64.b32decode('MLO23456'), b'b\xdd\xad\xf3\xbe')
- map_tests = {(b'M1023456', b'L'): b'b\xdd\xad\xf3\xbe',
- (b'M1023456', b'I'): b'b\x1d\xad\xf3\xbe',
- }
- for (data, map01), res in map_tests.items():
- data_str = data.decode('ascii')
+ def test_b32decode_map01(self):
+ # Mapping zero and one
+ eq = self.assertEqual
+ res_L = b'b\xdd\xad\xf3\xbe'
+ res_I = b'b\x1d\xad\xf3\xbe'
+ eq(base64.b32decode(b'MLO23456'), res_L)
+ eq(base64.b32decode('MLO23456'), res_L)
+ eq(base64.b32decode(b'MIO23456'), res_I)
+ eq(base64.b32decode('MIO23456'), res_I)
+ self.assertRaises(binascii.Error, base64.b32decode, b'M1023456')
+ self.assertRaises(binascii.Error, base64.b32decode, b'M1O23456')
+ self.assertRaises(binascii.Error, base64.b32decode, b'ML023456')
+ self.assertRaises(binascii.Error, base64.b32decode, b'MI023456')
+
+ data = b'M1023456'
+ data_str = data.decode('ascii')
+ for map01, res in [(b'L', res_L), (b'I', res_I)]:
map01_str = map01.decode('ascii')
eq(base64.b32decode(data, map01=map01), res)
eq(base64.b32decode(data_str, map01=map01), res)
eq(base64.b32decode(data, map01=map01_str), res)
eq(base64.b32decode(data_str, map01=map01_str), res)
- self.assertRaises(binascii.Error, base64.b32decode, data)
- self.assertRaises(binascii.Error, base64.b32decode, data_str)
+
+ eq(base64.b32decode(b'M1O23456', map01=map01), res)
+ eq(base64.b32decode(b'M%c023456' % map01, map01=map01), res)
+ eq(base64.b32decode(b'M%cO23456' % map01, map01=map01), res)
def test_b32decode_error(self):
tests = [b'abc', b'ABCDEF==', b'==ABCDEF']
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
