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

Merged revisions 80720 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80720 | antoine.pitrou | 2010-05-03 18:25:33 +0200 (lun., 03 mai 2010) | 5 lines

  Issue #7865: The close() method of :mod:`io` objects should not swallow
  exceptions raised by the implicit flush().  Also ensure that calling
  close() several times is supported.  Patch by Pascal Chambon.
........
This commit is contained in:
Antoine Pitrou 2010-05-03 16:48:13 +00:00
parent 2f49f4eb70
commit 01a255add1
4 changed files with 58 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Lib/io.py
View file

@ -368,6 +368,9 @@ class IOBase(object):
This is not implemented for read-only and non-blocking streams.
"""
if self.__closed:
raise ValueError("flush of closed file")
#self._checkClosed()
# XXX Should this return the number of bytes written???
__closed = False
@ -378,10 +381,7 @@ class IOBase(object):
This method has no effect if the file is already closed.
"""
if not self.__closed:
try:
self.flush()
except IOError:
pass # If flush() fails, just give up
self.flush()
self.__closed = True
def __del__(self):
@ -751,10 +751,7 @@ class _BufferedIOMixin(BufferedIOBase):
def close(self):
if not self.closed:
try:
self.flush()
except IOError:
pass # If flush() fails, just give up
self.flush()
self.raw.close()
### Inquiries ###
@ -1087,6 +1084,8 @@ class BufferedWriter(_BufferedIOMixin):
return self.raw.truncate(pos)
def flush(self):
if self.closed:
raise ValueError("flush of closed file")
with self._write_lock:
self._flush_unlocked()
@ -1472,11 +1471,9 @@ class TextIOWrapper(TextIOBase):
self._telling = self._seekable
def close(self):
try:
if not self.closed:
self.flush()
except:
pass # If flush() fails, just give up
self.buffer.close()
self.buffer.close()
@property
def closed(self):