| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
Sorry, something went wrong.
Sorry, something went wrong.
|
It's a year later, and Z85 support has been added to base64 in the meantime. So while bringing this PR up to date with main, I added Z85 support to it as well. For reference, this is the benchmark run that led me to do so. # After merging main but before adding Z85 support to this PR
(cpython-b85) $ python bench_b85.py 64
b64encode : 67108864 b in 0.121 s (527.435 MB/s) using 42.667 MB
b64decode : 89478488 b in 0.309 s (276.188 MB/s) using 56.889 MB
a85encode : 67108864 b in 0.297 s (215.150 MB/s) using 0.000 MB
a85decode : 83886080 b in 0.205 s (390.751 MB/s) using 0.000 MB
b85encode : 67108864 b in 0.106 s (604.359 MB/s) using 0.000 MB
b85decode : 83886080 b in 0.204 s (393.040 MB/s) using 0.000 MB
z85encode : 67108864 b in 0.204 s (313.610 MB/s) using 80.000 MB
z85decode : 83886080 b in 0.300 s (266.670 MB/s) using 100.000 MBThe existing Z85 implementation translates from the standard base85 alphabet to Z85 after the fact and within Python, so it was already benefiting from this PR but with substantial performance and memory usage overhead. That overhead is now gone. |
Sorry, something went wrong.
Sorry, something went wrong.
Add Ascii85, base85, and Z85 encoders and decoders to `binascii`, replacing the existing pure Python implementations in `base64`. No API or documentation changes are necessary with respect to `base64.a85encode()`, `b85encode()`, etc., and all existing unit tests for those functions continue to pass without modification. Note that attempting to decode Ascii85 or base85 data of length 1 mod 5 (after accounting for Ascii85 quirks) now produces an error, as no encoder would emit such data. This should be the only significant externally visible difference compared to the old implementation. Resolves: pythongh-101178
|
PR has been rebased onto main at 78cfee6 with squashing. |
Sorry, something went wrong.
I believe you have to document this change. |
Sorry, something went wrong.
Fair point, I could do that. In case anyone argues for keeping the old behavior (silently ignoring length 1 mod 5), I won't do it just yet. |
Sorry, something went wrong.
If we were strictly following PEP-0399, _base64 would be a C module for accelerated functions in base64. Due to historical reasons, those should actually go in binascii instead. We still want to preserve the existing Python code in base64. Parting out facilities for accessing the C functions into a module named _base64 shouldn't risk a naming conflict and will simplify testing.
This is done differently to PEP-0399 to minimize the number of changed lines.
As we're now keeping the existing Python base 85 functions, the C implementations should behave exactly the same, down to exception type and wording. It is also no longer an error to try to decode data of length 1 mod 5.
|
The PR has been updated to preserve the existing base 85 Python functions in base64 and modify the new base 85 C functions in binascii to closely match their behavior. Notably, trying to decode data of length 1 mod 5 is no longer an error. |
Sorry, something went wrong.
Importing update_wrapper() from functools to copy attributes is expensive. Do it ourselves for only the most relevant ones.
This requires some code duplication, but oh well.
Using a decorator complicates function signature introspection.
Do we really need to test the legacy API twice?
Include an integer overflow check for Ascii85.
Performance gains of up to 8% for a2b_ascii85() and 25% for a2b_base85() and a2b_z85() were observed.
|
The PR has been updated to address most reviewer comments. I even found some minor decoding performance gains. A bit more polish and this one will be done! |
Sorry, something went wrong.
There was a problem hiding this comment.
Thank you for your update @kangtastic. I added support of ignorechars in the Base64 decoder, so now the similar code can be used in the Ascii85 decoder. Also note the changes in the Ascii85 documentation.
Sorry, something went wrong.
| * | ||
| pad: bool = False | ||
| Pad input to a multiple of 4 before encoding. | ||
| newline: bool = True |
There was a problem hiding this comment.
b2a_base64() adds a newline by default. The newline parameter was added to alter the default behavior. But b2a_base85() does not have such historical baggage, it should not add a newline by default, and does not need to add it optionally (you always can add it after calling the function).
Sorry, something went wrong.
| data: ascii_buffer | ||
| / | ||
| * | ||
| strict_mode: bool = False |
There was a problem hiding this comment.
Base64 decoder works in non-strict mode by default. This is legacy. The strict_mode parameter was added to change the default behavior. But Base85 decoder never worked in non-strict mode and does not need to.
Sorry, something went wrong.
| fold_spaces: bool = False | ||
| Allow 'y' as a short form encoding four spaces. | ||
| wrap: bool = False | ||
| Expect data to be wrapped in '<~' and '~>' as in Adobe Ascii85. | ||
| ignore: Py_buffer(c_default="NULL", py_default="b''") = None | ||
| An optional bytes-like object with input characters to be ignored. |
There was a problem hiding this comment.
I think that it would be less confusing if both interfaces, in binascii and base64, would use the same names for parameters, if possible. I don't know why strict_mode and validate differ, this is confusing.
"ignore" was previously only used as the name of the error handler (like "strict", "replace", etc).
Sorry, something went wrong.
| } | ||
|
|
||
| /* Build ignore map. */ | ||
| unsigned char ignore_map[256] = {0}; |
There was a problem hiding this comment.
This may be slow. Look how it was done for the Base64 decoder.
Sorry, something went wrong.
|
@serhiy-storchaka, sorry I was busy and didn't get to your feedback this past week. Looks good. One last thing from me - I noticed you changed the clinic input for the ignorechars param in binascii.a2b_base64() to ignorechars: Py_buffer(py_default="<unrepresentable>") = None. I found a discussion thread about <unrepresentable> being for C arguments that are NULL, but it looks like the way you have it, ignorechars actually isn't NULL on the C side in binascii.a2b_base64(), so I don't know what's going on and if this change should be carried over to binascii.a2b_ascii85() or not. |
Sorry, something went wrong.
|
No problem, I pushed my changes because there are several other issues wait for this change (Base32 codec, wrapcol and ignorechars for more codecs, maybe other options). Your work is great, sorry that it took several years to review it. binascii.a2b_base64() is special case. It is non-strict by default, but this is a vulnerability. Since ignorechars is a new parameter, we can switch to strict mode by default if it is used. So, showing ignorechars=b'') in the signature would be a lie, because passing ignorechars=b'' and not passing the ignorechars argument have different semantic. So we use a special placeholder. This is temporary, when we made binascii.a2b_base64() strict by default, we could just make b'' the default value for ignorechars. The Ascii85 codec does not have such legacy. There is also a bug in the Py_buffer converter. I only discovered it when worked on these issues. It only accepts None as the default value, even if None is not valid value for Py_buffer. It should accept NULL and a bytes literal. Then these declarations would look more natural. |
Sorry, something went wrong.
|
Thanks for the explanation about clinic input. And thanks again for accepting my PR and making the process pleasant. The timeline is indeed unfortunate but also isn't anyone's fault. |
Sorry, something went wrong.
…thonGH-102753) Add Ascii85, Base85, and Z85 encoders and decoders to binascii, replacing the existing pure Python implementations in base64. This makes the codecs two orders of magnitude faster and consume two orders of magnitude less memory. Note that attempting to decode Ascii85 or Base85 data of length 1 mod 5 (after accounting for Ascii85 quirks) now produces an error, as no encoder would emit such data. This should be the only significant externally visible difference compared to the old implementation. Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
|
@kangtastic, are you also interested in implementing the Base32 codec in C? This will not only improve its performance and memory usage, but also make it easier to add more features in the future. I'm going to do it eventually, but I'm short on time right now. If you're interested, I promise a quick review. |
Sorry, something went wrong.
|
@serhiy-storchaka, I'm also short on time for the next ~2 weeks, but I might be interested after that. I'll ping you in this issue when I know for sure. |
Sorry, something went wrong.
|
@serhiy-storchaka, I'm interested in writing that Base32 implementation after all. Let me know if it's still needed/if you're looking for anything specific. |
Sorry, something went wrong.
|
It would be great! I asked you because I see that you are quite capable of this, and it might also be interesting for you. As for anything specific, I suggest to keep the code for casefold and map01 in Python for now, like in the Base16 codec. |
Sorry, something went wrong.
|
@serhiy-storchaka, OK, I'll get started and do it as you suggest. |
Sorry, something went wrong.
|
See also #145980. It would be enough to only implement a single pair of functions for Base32. |
Sorry, something went wrong.
|
@serhiy-storchaka, did you want me to wait for #145981 to be finalized and merged before I create an issue and a PR for the base32 accelerator? It's almost finished except for testing, etc. |
Sorry, something went wrong.
…thonGH-102753) Add Ascii85, Base85, and Z85 encoders and decoders to binascii, replacing the existing pure Python implementations in base64. This makes the codecs two orders of magnitude faster and consume two orders of magnitude less memory. Note that attempting to decode Ascii85 or Base85 data of length 1 mod 5 (after accounting for Ascii85 quirks) now produces an error, as no encoder would emit such data. This should be the only significant externally visible difference compared to the old implementation. Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
| Back | FazBrowse Home | New Git URL |
Synopsis
Add Ascii85, Base85, and Z85 encoder and decoder functions implemented in C to binascii and use them to greatly improve the performance and reduce the memory usage of the existing Ascii85, Base85, and Z85 codec functions in base64.
No API or documentation changes are necessary with respect to any functions in base64, and all existing unit tests for those functions continue to pass without modification.
Resolves: gh-101178
Discussion
The base85-related functions in base64 are now wrappers for the new functions in binascii, as envisioned in the docs:
Parting out Ascii85 from Base85 and Z85 was warranted in my testing despite the code duplication due to the various performance-murdering special cases in Ascii85.
Comments and questions are welcome.
Benchmarks
Updated December 28, 2025.
The old pure-Python implementation is two orders of magnitude slower and uses over O(40n) temporary memory.