Merge with 3.5

diff --cc Lib/email/contentmanager.py
Simple merge

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

diff --cc Misc/NEWS
index 1e29158d96be2a33a7322ddfc0f42cd8df61fa2f,e4061d64d43ed38d2af0288717715f4eda49a0d6..98c049b983d66351aea149262d5dafe31ec498c2
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -113,13 -62,11 +113,18 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #24594: Validates persist parameter when opening MSI database
+ 
+ - Issue #28047: Fixed calculation of line length used for the base64 CTE
+   in the new email policies.
+ 
 +- Issue #27576: Fix call order in OrderedDict.__init__().
 +
 +- email.generator.DecodedGenerator now supports the policy keyword.
 +
 +- Issue #28027: Remove undocumented modules from ``Lib/plat-*``: IN, CDROM,
 +  DLFCN, TYPES, CDIO, and STROPTS.
 +
  - Issue #27445: Don't pass str(_charset) to MIMEText.set_payload().
    Patch by Claude Paroz.
  

diff --cc PC/_msi.c
Simple merge