Skip to content

gh-101178: refactor base64.b85encode to be memory friendly #112248

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

Closed
romuald wants to merge 7 commits into from
Closed

gh-101178: refactor base64.b85encode to be memory friendly #112248

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
84e20ea
gh-101178: C implementation of base64._a85encode
romuald Feb 16, 2025
74fc245
Add possible regression test in test_base64
romuald Feb 16, 2025
60a3ae6
Review changes Modules/binascii.c
romuald Feb 16, 2025
aaa09e1
Review fixes: update algorithm
romuald Feb 16, 2025
cb46a5d
Further plagiate git's implementation
romuald Feb 17, 2025
c88450b
Rename b2a_base85 as private for now
romuald Feb 17, 2025
2fc892c
Credit to git's implementation and more comments
romuald Feb 17, 2025
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
Rename b2a_base85 as private for now
  • Loading branch information
@romuald
romuald committed Feb 17, 2025
commit c88450ba34e4ba9c4fbbe470a6c54a5a3bcf709d
4 changes: 2 additions & 2 deletions Lib/base64.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,8 @@ def _85encode(b, chars, chars2, pad=False, foldnuls=False, foldspaces=False):
if not isinstance(b, bytes_types):
b = memoryview(b).tobytes()

return binascii.b2a_base85(b, chars=chars, pad=pad,
foldnuls=foldnuls, foldspaces=foldspaces)
return binascii._b2a_base85(b, chars=chars, pad=pad,
foldnuls=foldnuls, foldspaces=foldspaces)

def a85encode(b, *, foldspaces=False, wrapcol=0, pad=False, adobe=False):
"""Encode bytes-like object b using Ascii85 and return a bytes object.
Expand Down
11 changes: 6 additions & 5 deletions Modules/binascii.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ binascii_b2a_qp_impl(PyObject *module, Py_buffer *data, int quotetabs,
}

/*[clinic input]
binascii.b2a_base85
binascii._b2a_base85

data: Py_buffer
chars: Py_buffer
Expand All @@ -1259,9 +1259,10 @@ Utility method used by the base64 module to encode a85/b85 data
[clinic start generated code]*/

static PyObject *
binascii_b2a_base85_impl(PyObject *module, Py_buffer *data, Py_buffer *chars,
int pad, int foldnuls, int foldspaces)
/*[clinic end generated code: output=0a92b3c535580aa0 input=a2d8ae712ed5adba]*/
binascii__b2a_base85_impl(PyObject *module, Py_buffer *data,
Py_buffer *chars, int pad, int foldnuls,
int foldspaces)
/*[clinic end generated code: output=cefe84c300ad7314 input=3c8faf77b992dcc2]*/
{
if (chars->len != 85) {
PyErr_SetString(PyExc_ValueError,
Expand Down Expand Up @@ -1336,7 +1337,7 @@ static struct PyMethodDef binascii_module_methods[] = {
BINASCII_B2A_UU_METHODDEF
BINASCII_A2B_BASE64_METHODDEF
BINASCII_B2A_BASE64_METHODDEF
BINASCII_B2A_BASE85_METHODDEF
BINASCII__B2A_BASE85_METHODDEF
BINASCII_A2B_HEX_METHODDEF
BINASCII_B2A_HEX_METHODDEF
BINASCII_HEXLIFY_METHODDEF
Expand Down
23 changes: 12 additions & 11 deletions Modules/clinic/binascii.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.