mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

SF patch# 1757839 by Alexandre Vassalotti -- make test_mailbox and

Browse source 
test_old_mailbox pass.
This commit is contained in:
Guido van Rossum 2007-07-21 00:21:26 +00:00
parent bf4806bac5
commit d4eda825c7
4 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/mailbox.py
View file

@ -498,15 +498,15 @@ class _singlefileMailbox(Mailbox):
"""Initialize a single-file mailbox."""
Mailbox.__init__(self, path, factory, create)
try:
f = open(self._path, 'rb+')
f = open(self._path, 'r+')
except IOError as e:
if e.errno == errno.ENOENT:
if create:
f = open(self._path, 'wb+')
f = open(self._path, 'w+')
else:
raise NoSuchMailboxError(self._path)
elif e.errno == errno.EACCES:
f = open(self._path, 'rb')
f = open(self._path, 'r')
else:
raise
self._file = f
@ -1761,11 +1761,11 @@ class _ProxyFile:
def read(self, size=None):
"""Read bytes."""
return self._read(size, self._file.read)
return str(self._read(size, self._file.read))
def readline(self, size=None):
"""Read a line."""
return self._read(size, self._file.readline)
return str(self._read(size, self._file.readline))
def readlines(self, sizehint=None):
"""Read multiple lines."""
@ -1900,7 +1900,7 @@ def _create_carefully(path):
"""Create a file if it doesn't exist and open for reading and writing."""
fd = os.open(path, os.O_CREAT | os.O_EXCL | os.O_RDWR)
try:
return open(path, 'rb+')
return open(path, 'r+')
finally:
os.close(fd)