From: R David Murray <rdmurray@bitdance.com>
Date: Wed, 16 Mar 2011 20:13:07 +0000 (-0400)
Subject: Merge #9298 fix.
X-Git-Tag: v3.2.1b1~271
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78099bb153c2b8399f80cb32798dda7215945157;p=thirdparty%2FPython%2Fcpython.git

Merge #9298 fix.
---

78099bb153c2b8399f80cb32798dda7215945157
diff --cc Misc/ACKS
index 1e2b83d4cedf,5d9b198301ed..0cbc6703d27e
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -223,8 -201,8 +223,9 @@@ Yves Dionn
  Daniel Dittmar
  Jaromir Dolecek
  Ismail Donmez
 +Marcos Donolo
  Dima Dorfman
+ Yves Dorfsman
  Cesar Douady
  Dean Draayer
  Fred L. Drake, Jr.
diff --cc Misc/NEWS
index 419b0d5dcc0d,beb6ec1c1210..9af144246801
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -40,12 -40,10 +40,16 @@@ Core and Builtin
  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.
 +
 +- Issue #11133: fix two cases where inspect.getattr_static can trigger code
 +  execution. Patch by Andreas Stührk.
 +
  - Issue #11569: use absolute path to the sysctl command in multiprocessing to
    ensure that it will be found regardless of the shell PATH. This ensures
    that multiprocessing.cpu_count works on default installs of MacOSX.