From bf730ca4f5860e006d4e4b9a9410a54e7012fc45 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Fri, 24 May 2024 00:11:45 +0200 Subject: [PATCH] Clarify base64.a85encode docs: *wrapcols* doesn't count the newline (GH-119409) (cherry picked from commit ffa24aab107b5bc3c6ad31a6a245c226bf24b208) Co-authored-by: Petr Viktorin --- Doc/library/base64.rst | 2 +- Lib/base64.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/base64.rst b/Doc/library/base64.rst index 8d5d9757143062..9171e414a79601 100644 --- a/Doc/library/base64.rst +++ b/Doc/library/base64.rst @@ -193,7 +193,7 @@ The modern interface provides: *wrapcol* controls whether the output should have newline (``b'\n'``) characters added to it. If this is non-zero, each output line will be - at most this many characters long. + at most this many characters long, excluding the trailing newline. *pad* controls whether the input is padded to a multiple of 4 before encoding. Note that the ``btoa`` implementation always pads. diff --git a/Lib/base64.py b/Lib/base64.py index e233647ee76639..846767a3d5a49e 100755 --- a/Lib/base64.py +++ b/Lib/base64.py @@ -334,7 +334,7 @@ def a85encode(b, *, foldspaces=False, wrapcol=0, pad=False, adobe=False): wrapcol controls whether the output should have newline (b'\\n') characters added to it. If this is non-zero, each output line will be at most this - many characters long. + many characters long, excluding the trailing newline. pad controls whether the input is padded to a multiple of 4 before encoding. Note that the btoa implementation always pads.