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

diff --cc Lib/test/test_email/test_email.py
Simple merge

diff --cc Misc/NEWS
index 5b90097c365040dfd4da43ab13460990bff54442,dc2e4ecf68674fa17b99f2ccd6d73f61000b02b0..f2bad73fa0523ffaed3f818e4459e55ea3904b8e
--- 1/Misc/NEWS
--- 2/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