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

merge 3.3 (#16597)

Browse source
This commit is contained in:
Benjamin Peterson 2012-12-20 11:55:16 -06:00
commit 4c05969fc4
5 changed files with 80 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/_pyio.py
View file

@ -346,8 +346,10 @@ class IOBase(metaclass=abc.ABCMeta):
This method has no effect if the file is already closed.
"""
if not self.__closed:
self.flush()
self.__closed = True
try:
self.flush()
finally:
self.__closed = True
def __del__(self):
"""Destructor. Calls close()."""
@ -1584,8 +1586,10 @@ class TextIOWrapper(TextIOBase):
def close(self):
if self.buffer is not None and not self.closed:
self.flush()
self.buffer.close()
try:
self.flush()
finally:
self.buffer.close()
@property
def closed(self):