Issue #20079: Fixed tests.
Issue #20079: Fixed tests.
Closes #19434: fix copy-paste error in MIMENonMultipart docstring.
merge 3.4
Closes #18729: minor markup improvement.
merge 3.4