From 205e75bb629408d850efd6659c87ba1f8512b44b Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Wed, 24 Feb 2016 12:05:50 +0200 Subject: Issue #25913: Leading <~ is optional now in base64.a85decode() with adobe=True. Patch by Swati Jaiswal. --- Lib/base64.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'Lib/base64.py') diff --git a/Lib/base64.py b/Lib/base64.py index e2c597b0ca6..adaec1de61b 100755 --- a/Lib/base64.py +++ b/Lib/base64.py @@ -367,10 +367,15 @@ def a85decode(b, *, foldspaces=False, adobe=False, ignorechars=b' \t\n\r\v'): """ b = _bytes_from_decode_data(b) if adobe: - if not (b.startswith(_A85START) and b.endswith(_A85END)): - raise ValueError("Ascii85 encoded byte sequences must be bracketed " - "by {!r} and {!r}".format(_A85START, _A85END)) - b = b[2:-2] # Strip off start/end markers + if not b.endswith(_A85END): + raise ValueError( + "Ascii85 encoded byte sequences must end " + "with {!r}".format(_A85END) + ) + if b.startswith(_A85START): + b = b[2:-2] # Strip off start/end markers + else: + b = b[:-2] # # We have to go through this stepwise, so as to ignore spaces and handle # special short sequences -- cgit v1.2.3