http://hg.python.org/cpython/rev/f0eedca4b2a2 changeset: 85479:f0eedca4b2a2 branch: 3.3 parent: 85477:dfbf0f9034cc user: Terry Jan Reedy <tjreedy@udel.edu> date: Sat Aug 31 17:12:21 2013 -0400 summary: Issue #12037: Fix test_email for desktop Windows. files: Lib/test/test_email/test_email.py | 4 ++-- Misc/NEWS | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -180,8 +180,8 @@ def test_byte_message_rfc822_only(self): # Make sure new bytes header parser also passes this. - with openfile('msg_46.txt', 'rb') as fp: - msgdata = fp.read() + with openfile('msg_46.txt') as fp: + msgdata = fp.read().encode('ascii') parser = email.parser.BytesHeaderParser() msg = parser.parsebytes(msgdata) out = BytesIO() diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -314,6 +314,8 @@ Tests ----- +- Issue #12037: Fix test_email for desktop Windows. + - Issue #15507: test_subprocess's test_send_signal could fail if the test runner were run in an environment where the process inherited an ignore setting for SIGINT. Restore the SIGINT handler to the desired -- Repository URL: http://hg.python.org/cpython