Skip to content

gh-143214: Add the wrapcol parameter in binascii.b2a_base64() and base64.b64encode() #143216

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 18 commits into from
Jan 14, 2026
Merged

gh-143214: Add the wrapcol parameter in binascii.b2a_base64() and base64.b64encode() #143216

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b7196ba
gh-143214: Add the wrapcol parameter in binascii.b2a_base64() and bas…
serhiy-storchaka Dec 26, 2025
50eb52d
Fix errors.
serhiy-storchaka Dec 27, 2025
7c7f2dc
Add tests.
serhiy-storchaka Dec 27, 2025
e429f03
Update the name of Hauke Dämpfling.
serhiy-storchaka Dec 27, 2025
46c6a25
Address review comments (signature, docstrings).
serhiy-storchaka Dec 27, 2025
5062ae5
Add more comments nd tests.
serhiy-storchaka Dec 27, 2025
cd2e330
Mark CPython specific tests as such.
serhiy-storchaka Dec 28, 2025
cb4af0e
Add more tests for a85encode().
serhiy-storchaka Dec 28, 2025
8a3e4e5
Encode a whole number of bytes per line.
serhiy-storchaka Dec 28, 2025
bd3ed76
Address review comment.
serhiy-storchaka Dec 31, 2025
7458e50
Merge branch 'main' into base64-encode-wrapcol
serhiy-storchaka Dec 31, 2025
a3bcc61
Address yet one review comment.
serhiy-storchaka Jan 2, 2026
bb5ff57
Merge branch 'main' into base64-encode-wrapcol
serhiy-storchaka Jan 2, 2026
7b3e7e1
Refactor plistlib.
serhiy-storchaka Jan 2, 2026
87a048d
Fix the indent width in plistlib.
serhiy-storchaka Jan 2, 2026
cb5c93f
Merge branch 'main' into base64-encode-wrapcol
serhiy-storchaka Jan 3, 2026
6d190e9
Polish docs.
serhiy-storchaka Jan 3, 2026
107224f
Merge branch 'main' into base64-encode-wrapcol
serhiy-storchaka Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Encode a whole number of bytes per line.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Dec 28, 2025
commit 8a3e4e5c0f807bdaaa9d54d64583a43b1ad43f02
4 changes: 2 additions & 2 deletions Lib/test/test_base64.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,9 @@ def test_b64encode_wrapcol(self):
b = b'www.python.org'
eq(base64.b64encode(b, wrapcol=0), b'd3d3LnB5dGhvbi5vcmc=')
eq(base64.b64encode(b, wrapcol=8), b'd3d3LnB5\ndGhvbi5v\ncmc=')
eq(base64.b64encode(b, wrapcol=11), b'd3d3LnB5\ndGhvbi5v\ncmc=')
eq(base64.b64encode(b, wrapcol=76), b'd3d3LnB5dGhvbi5vcmc=')
eq(base64.b64encode(b, wrapcol=1),
b'd\n3\nd\n3\nL\nn\nB\n5\nd\nG\nh\nv\nb\ni\n5\nv\nc\nm\nc\n=')
eq(base64.b64encode(b, wrapcol=1), b'd3d3\nLnB5\ndGhv\nbi5v\ncmc=')
eq(base64.b64encode(b, wrapcol=sys.maxsize), b'd3d3LnB5dGhvbi5vcmc=')
if check_impl_detail():
eq(base64.b64encode(b, wrapcol=sys.maxsize*2),
Expand Down
4 changes: 3 additions & 1 deletion Lib/test/test_binascii.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,12 +493,14 @@ def test_b2a_base64_wrapcol(self):
b'd3d3LnB5dGhvbi5vcmc=\n')
self.assertEqual(binascii.b2a_base64(b, wrapcol=8),
b'd3d3LnB5\ndGhvbi5v\ncmc=\n')
self.assertEqual(binascii.b2a_base64(b, wrapcol=11),
b'd3d3LnB5\ndGhvbi5v\ncmc=\n')
self.assertEqual(binascii.b2a_base64(b, wrapcol=76),
b'd3d3LnB5dGhvbi5vcmc=\n')
self.assertEqual(binascii.b2a_base64(b, wrapcol=8, newline=False),
b'd3d3LnB5\ndGhvbi5v\ncmc=')
self.assertEqual(binascii.b2a_base64(b, wrapcol=1),
b'd\n3\nd\n3\nL\nn\nB\n5\nd\nG\nh\nv\nb\ni\n5\nv\nc\nm\nc\n=\n')
b'd3d3\nLnB5\ndGhv\nbi5v\ncmc=\n')
self.assertEqual(binascii.b2a_base64(b, wrapcol=sys.maxsize),
b'd3d3LnB5dGhvbi5vcmc=\n')
if check_impl_detail():
Expand Down
3 changes: 2 additions & 1 deletion Modules/binascii.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,6 @@ binascii_b2a_base64_impl(PyObject *module, Py_buffer *data, size_t wrapcol,

const unsigned char *bin_data = data->buf;
Py_ssize_t bin_len = data->len;

assert(bin_len >= 0);

/* Each group of 3 bytes (rounded up) gets encoded as 4 characters,
Expand All @@ -579,6 +578,8 @@ binascii_b2a_base64_impl(PyObject *module, Py_buffer *data, size_t wrapcol,
goto toolong;
}
if (wrapcol && out_len) {
/* Each line should encode a whole number of bytes. */
wrapcol = wrapcol < 4 ? 4 : wrapcol / 4 * 4;
out_len += (out_len - 1u) / wrapcol;
if (out_len > PY_SSIZE_T_MAX) {
goto toolong;
Expand Down
Loading