summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-08-31 17:12:21 -0400
committerTerry Jan Reedy <tjreedy@udel.edu>2013-08-31 17:12:21 -0400
commit740d6b6f39b169fe8c1ba2322fbab270aae731ea (patch)
treea6d3c4acadf5ca39f509628ea7a8d7b2db212245
parent31e4d325b61ed756c6fe86a77528a90f4a765d6b (diff)
downloadcpython-git-740d6b6f39b169fe8c1ba2322fbab270aae731ea.tar.gz
Issue #12037: Fix test_email for desktop Windows.
-rw-r--r--Lib/test/test_email/test_email.py4
-rw-r--r--Misc/NEWS2
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
index e11194b5b8..904c06a18c 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -180,8 +180,8 @@ class TestMessageAPI(TestEmailBase):
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
index 8f2b66e411..3961ef99f6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -314,6 +314,8 @@ IDLE
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