Merged revisions 80720 via svnmerge from
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.
........
diff --git a/Lib/io.py b/Lib/io.py
index d090eec..54de504 100644
--- a/Lib/io.py
+++ b/Lib/io.py
@@ -368,6 +368,9 @@
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 @@
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 @@
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 @@
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 @@
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):