"Port" the fix for issue 1974 from the trunk (2.7). Because Python 3.x does things much better, less changes are necessary.

This also shoves test_email_codecs_rename.py onto test_email_codecs.py even though the test needs to be ported to Python 3.