Merge: #16948: Fix quopri encoding of non-latin1 character sets.

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

diff --cc Misc/NEWS
index 699994330f8cb19375a61aba66a7f349ecad8972,b7eabd73a26e8525df9c2b1eb29f2de32a8366fc..03a4584529fe3d4334802fb630a48a265129f31a
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -163,14 -212,10 +163,17 @@@ Core and Builtin
  Library
  -------
  
 -
+ - Issue #16948: Fix quoted printable body encoding for non-latin1 character
+   sets in the email package.
+ 
 +- Issue #16811: Fix folding of headers with no value in the provisional email
 +  policies.
 +
 +- Issue #17132: Update symbol for "yield from" grammar changes.
 +
 +- Issue #17076: Make copying of xattrs more permissive of missing FS support.
 +  Patch by Thomas Wouters.
 +
  - Issue #17089: Expat parser now correctly works with string input not only when
    an internal XML encoding is UTF-8 or US-ASCII.  It now accepts bytes and
    strings larger than 2 GiB.