Mailing List Archive

Update of /cvsroot/python/python/dist/src/Lib/email/test
In directory usw-pr-cvs1:/tmp/cvs-serv28568/Lib/email/test

Modified Files:
test_email.py test_email_torture.py
Log Message:
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.


Index: test_email.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/email/test/test_email.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** test_email.py 1 Oct 2002 17:57:06 -0000 1.17
--- test_email.py 7 Oct 2002 17:27:55 -0000 1.18
***************
*** 47,51 ****
def openfile(filename):
path = os.path.join(os.path.dirname(landmark), 'data', filename)
! return open(path, 'rb')


--- 47,51 ----
def openfile(filename):
path = os.path.join(os.path.dirname(landmark), 'data', filename)
! return open(path, 'r')



Index: test_email_torture.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/email/test/test_email_torture.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_email_torture.py 18 Sep 2002 22:17:57 -0000 1.4
--- test_email_torture.py 7 Oct 2002 17:27:55 -0000 1.5
***************
*** 23,27 ****
from os.path import join, dirname, abspath
path = abspath(join(dirname(testfile), os.pardir, 'moredata', filename))
! return open(path, 'rb')

# Prevent this test from running in the Python distro
--- 23,27 ----
from os.path import join, dirname, abspath
path = abspath(join(dirname(testfile), os.pardir, 'moredata', filename))
! return open(path, 'r')

# Prevent this test from running in the Python distro