summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2011-03-16 20:14:43 (GMT)
committerR David Murray <rdmurray@bitdance.com>2011-03-16 20:14:43 (GMT)
commitbb35299fcd62d22a513dd33b8f9656de101575a6 (patch)
treea56d773dfccb55ce0259bc35807af3aca59fd218 /Misc
parent3271daa00d3fdf2a450726078ab4d27884bf1299 (diff)
parent78099bb153c2b8399f80cb32798dda7215945157 (diff)
downloadcpython-bb35299fcd62d22a513dd33b8f9656de101575a6.zip
cpython-bb35299fcd62d22a513dd33b8f9656de101575a6.tar.gz
cpython-bb35299fcd62d22a513dd33b8f9656de101575a6.tar.bz2
Merge #9298 fix.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS4
2 files changed, 5 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index c998250..997dd8c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -227,6 +227,7 @@ Jaromir Dolecek
Ismail Donmez
Marcos Donolo
Dima Dorfman
+Yves Dorfsman
Cesar Douady
Dean Draayer
Fred L. Drake, Jr.
diff --git a/Misc/NEWS b/Misc/NEWS
index 1de6111..90dd1d2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -72,6 +72,10 @@ Core and Builtins
Library
-------
+- Issue #9298: base64 bodies weren't being folded to line lengths less than 78,
+ which was a regression relative to Python2. Unlike Python2, the last line
+ of the folded body now ends with a carriage return.
+
- Issue #11560: shutil.unpack_archive now correctly handles the format
parameter. Patch by Evan Dandrea.