openfile(): Go back to opening the files in text mode. This undoes
the change in revision 1.11 (test_email.py) in response to SF bug
#609988. We now think that was the wrong fix and that WinZip was the
real culprit there.
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index 926c6bf..5bbb794 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -46,7 +46,7 @@
def openfile(filename):
path = os.path.join(os.path.dirname(landmark), 'data', filename)
- return open(path, 'rb')
+ return open(path, 'r')
diff --git a/Lib/email/test/test_email_torture.py b/Lib/email/test/test_email_torture.py
index 76d66a9..8d58b46 100644
--- a/Lib/email/test/test_email_torture.py
+++ b/Lib/email/test/test_email_torture.py
@@ -22,7 +22,7 @@
def openfile(filename):
from os.path import join, dirname, abspath
path = abspath(join(dirname(testfile), os.pardir, 'moredata', filename))
- return open(path, 'rb')
+ return open(path, 'r')
# Prevent this test from running in the Python distro
try: