(original) (raw)

changeset: 100312:ce5bf3290621 branch: 3.5 parent: 100310:0d9d8fdd9736 user: Serhiy Storchaka storchaka@gmail.com date: Wed Feb 24 12:05:50 2016 +0200 files: Lib/base64.py Lib/test/test_base64.py Misc/NEWS description: Issue #25913: Leading <~ is optional now in base64.a85decode() with adobe=True. Patch by Swati Jaiswal. diff -r 0d9d8fdd9736 -r ce5bf3290621 Lib/base64.py --- a/Lib/base64.py Wed Feb 24 05:12:59 2016 +0000 +++ b/Lib/base64.py Wed Feb 24 12:05:50 2016 +0200 @@ -367,10 +367,15 @@ """ 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 diff -r 0d9d8fdd9736 -r ce5bf3290621 Lib/test/test_base64.py --- a/Lib/test/test_base64.py Wed Feb 24 05:12:59 2016 +0000 +++ b/Lib/test/test_base64.py Wed Feb 24 12:05:50 2016 +0200 @@ -494,6 +494,7 @@ eq(base64.a85decode(data, adobe=False), res, data) eq(base64.a85decode(data.decode("ascii"), adobe=False), res, data) eq(base64.a85decode(b'<~' + data + b'~>', adobe=True), res, data) + eq(base64.a85decode(data + b'~>', adobe=True), res, data) eq(base64.a85decode('<~%s~>' % data.decode("ascii"), adobe=True), res, data) @@ -584,8 +585,6 @@ b"malformed", adobe=True) self.assertRaises(ValueError, base64.a85decode, b"<~still malformed", adobe=True) - self.assertRaises(ValueError, base64.a85decode, - b"also malformed~>", adobe=True) # With adobe=False (the default), Adobe framing markers are disallowed self.assertRaises(ValueError, base64.a85decode, diff -r 0d9d8fdd9736 -r ce5bf3290621 Misc/NEWS --- a/Misc/NEWS Wed Feb 24 05:12:59 2016 +0000 +++ b/Misc/NEWS Wed Feb 24 12:05:50 2016 +0200 @@ -76,6 +76,9 @@ Library ------- +- Issue #25913: Leading ``<~`` is optional now in base64.a85decode() with + adobe=True. Patch by Swati Jaiswal. + - Issue #26186: Remove an invalid type check in importlib.util.LazyLoader. - Issue #26367: importlib.__import__() raises SystemError like /storchaka@gmail.com