From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 28 May 2024 14:55:43 +0000 (+0200)
Subject: [3.12] Clarify base64.a85encode docs: *wrapcols* doesn't count the newline (GH-119409... 
X-Git-Tag: v3.12.4~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3af9b75df5c1fda0ae9f1869da104e90805e8467;p=thirdparty%2FPython%2Fcpython.git

[3.12] Clarify base64.a85encode docs: *wrapcols* doesn't count the newline (GH-119409) (GH-119482)

Clarify base64.a85encode docs: *wrapcols* doesn't count the newline (GH-119409)
(cherry picked from commit ffa24aab107b5bc3c6ad31a6a245c226bf24b208)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
---

diff --git a/Doc/library/base64.rst b/Doc/library/base64.rst
index 8d5d97571430..9171e414a796 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 e233647ee766..846767a3d5a4 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.