Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork32.2k
gh-101178: Add Ascii85, base85, and Z85 support to binascii#102753
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Open
kangtastic wants to merge12 commits intopython:mainChoose a base branch
base:main
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Uh oh!
There was an error while loading.Please reload this page.
Open
Changes from1 commit
Commits
Show all changes
12 commits Select commitHold shift + click to select a range
05ae5ad Add Ascii85, base85, and Z85 support to binascii
kangtasticaa06c5d Restore base64.py
kangtastic6377440 Create _base64 module with wrappers for accelerated functions
kangtastic6c0e4a3 Test both Python and C codepaths in base64
kangtasticce4773c Match behavior between Python and C base 85 functions
kangtastic4072e3b Add Z85 tests to binascii
kangtasticbc9217f Update generated files
kangtastic2c40ba0 Avoid importing functools
kangtasticfd9eaf7 Avoid circular import in _base64
kangtastic4746d18 Do not use a decorator for changing exception type
kangtasticd075593 Test Python and C codepaths in base64 using mixins
kangtastic6d65fec Remove leading underscore from functions in private module
kangtasticFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
Test both Python and C codepaths in base64
This is done differently toPEP-0399 to minimize the number ofchanged lines.
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commit6c0e4a3089a90a21e35e48731ca5a976acf4095a
There are no files selected for viewing
40 changes: 39 additions & 1 deletionLib/test/test_base64.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,37 @@ | ||
| import unittest | ||
| import binascii | ||
| import os | ||
| from array import array | ||
| from functools import update_wrapper | ||
| from test.support import os_helper | ||
| from test.support import script_helper | ||
| from test.support.import_helper import import_fresh_module | ||
| base64 = import_fresh_module("base64", blocked=["_base64"]) | ||
| c_base64 = import_fresh_module("base64", fresh=["_base64"]) | ||
| def with_c_implementation(test_func): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Instead of a decorator, perhaps use the mixin approach from other modules. | ||
| if c_base64 is None: | ||
| return test_func | ||
| def _test_func(self): | ||
| global base64 | ||
| # Test Python implementation | ||
| test_func(self) | ||
| # Test C implementation | ||
| base64_ = base64 | ||
| try: | ||
| base64 = c_base64 | ||
| test_func(self) | ||
| finally: | ||
| base64 = base64_ | ||
| update_wrapper(_test_func, test_func) | ||
| return _test_func | ||
| class LegacyBase64TestCase(unittest.TestCase): | ||
| @@ -461,6 +488,7 @@ def test_b16decode(self): | ||
| # Incorrect "padding" | ||
| self.assertRaises(binascii.Error, base64.b16decode, '010') | ||
| @with_c_implementation | ||
| def test_a85encode(self): | ||
| eq = self.assertEqual | ||
| @@ -511,6 +539,7 @@ def test_a85encode(self): | ||
| eq(base64.a85encode(b' '*6, foldspaces=True, adobe=False), b'y+<U') | ||
| eq(base64.a85encode(b' '*5, foldspaces=True, adobe=False), b'y+9') | ||
| @with_c_implementation | ||
| def test_b85encode(self): | ||
| eq = self.assertEqual | ||
| @@ -545,6 +574,7 @@ def test_b85encode(self): | ||
| self.check_other_types(base64.b85encode, b"www.python.org", | ||
| b'cXxL#aCvlSZ*DGca%T') | ||
| @with_c_implementation | ||
| def test_z85encode(self): | ||
| eq = self.assertEqual | ||
| @@ -579,6 +609,7 @@ def test_z85encode(self): | ||
| self.check_other_types(base64.z85encode, b"www.python.org", | ||
| b'CxXl-AcVLsz/dgCA+t') | ||
| @with_c_implementation | ||
| def test_a85decode(self): | ||
| eq = self.assertEqual | ||
| @@ -625,6 +656,7 @@ def test_a85decode(self): | ||
| self.check_other_types(base64.a85decode, b'GB\\6`E-ZP=Df.1GEb>', | ||
| b"www.python.org") | ||
| @with_c_implementation | ||
| def test_b85decode(self): | ||
| eq = self.assertEqual | ||
| @@ -660,6 +692,7 @@ def test_b85decode(self): | ||
| self.check_other_types(base64.b85decode, b'cXxL#aCvlSZ*DGca%T', | ||
| b"www.python.org") | ||
| @with_c_implementation | ||
| def test_z85decode(self): | ||
| eq = self.assertEqual | ||
| @@ -695,6 +728,7 @@ def test_z85decode(self): | ||
| self.check_other_types(base64.z85decode, b'CxXl-AcVLsz/dgCA+t', | ||
| b'www.python.org') | ||
| @with_c_implementation | ||
| def test_a85_padding(self): | ||
| eq = self.assertEqual | ||
| @@ -710,6 +744,7 @@ def test_a85_padding(self): | ||
| eq(base64.a85decode(b'G^+IX'), b"xxxx") | ||
| eq(base64.a85decode(b'G^+IXGQ7^D'), b"xxxxx\x00\x00\x00") | ||
| @with_c_implementation | ||
| def test_b85_padding(self): | ||
| eq = self.assertEqual | ||
| @@ -725,6 +760,7 @@ def test_b85_padding(self): | ||
| eq(base64.b85decode(b'czAet'), b"xxxx") | ||
| eq(base64.b85decode(b'czAetcmMzZ'), b"xxxxx\x00\x00\x00") | ||
| @with_c_implementation | ||
| def test_a85decode_errors(self): | ||
| illegal = (set(range(32)) | set(range(118, 256))) - set(b' \t\n\r\v') | ||
| for c in illegal: | ||
| @@ -762,6 +798,7 @@ def test_a85decode_errors(self): | ||
| self.assertRaises(ValueError, base64.a85decode, b'aaaay', | ||
| foldspaces=True) | ||
| @with_c_implementation | ||
| def test_b85decode_errors(self): | ||
| illegal = list(range(33)) + \ | ||
| list(b'"\',./:[\\]') + \ | ||
| @@ -776,6 +813,7 @@ def test_b85decode_errors(self): | ||
| self.assertRaises(ValueError, base64.b85decode, b'|NsC') | ||
| self.assertRaises(ValueError, base64.b85decode, b'|NsC1') | ||
| @with_c_implementation | ||
| def test_z85decode_errors(self): | ||
| illegal = list(range(33)) + \ | ||
| list(b'"\',;_`|\\~') + \ | ||
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.