diff options
author | Barry Warsaw <barry@python.org> | 2002-10-07 17:27:55 (GMT) |
---|---|---|
committer | Barry Warsaw <barry@python.org> | 2002-10-07 17:27:55 (GMT) |
commit | 08c82b8086d2edae9937aabb0945e4f08eec447a (patch) | |
tree | a5237679c827f0dc9f023f093ab791b737a2191f | |
parent | 487fe6ac398b38b604d56285f2afb71e3ddbeb91 (diff) | |
download | cpython-08c82b8086d2edae9937aabb0945e4f08eec447a.zip cpython-08c82b8086d2edae9937aabb0945e4f08eec447a.tar.gz cpython-08c82b8086d2edae9937aabb0945e4f08eec447a.tar.bz2 |
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.
-rw-r--r-- | Lib/email/test/test_email.py | 2 | ||||
-rw-r--r-- | Lib/email/test/test_email_torture.py | 2 |
2 files changed, 2 insertions, 2 deletions
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 @@ warnings.filterwarnings('ignore', '', DeprecationWarning, __name__) 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 @@ from email.Iterators import _structure 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: |