From: R David Murray <rdmurray@bitdance.com>
Date: Mon, 11 Feb 2013 15:53:35 +0000 (-0500)
Subject: Merge: #17171: fix email.encoders.encode_7or8bit when applied to binary data.
X-Git-Tag: v3.3.1rc1~183
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66383b2e0a47cebf31586a1038e85d37c9aefadc;p=thirdparty%2FPython%2Fcpython.git

Merge: #17171: fix email.encoders.encode_7or8bit when applied to binary data.
---

66383b2e0a47cebf31586a1038e85d37c9aefadc
diff --cc Misc/NEWS
index 5b90097c3650,dc2e4ecf6867..f2bad73fa052
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -175,10 -221,11 +175,13 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #16564: Fixed regression relative to Python2 in the operation of
+   email.encoders.encode_7or8bit when used with binary data.
+ 
  - Issue #17052: unittest discovery should use self.testLoader.
  
 +- Issue #4591: Uid and gid values larger than 2**31 are supported now.
 +
  - Issue #17141: random.vonmisesvariate() no more hangs for large kappas.
  
  - Issue #17149: Fix random.vonmisesvariate to always return results in