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

#11700: proxy object close methods can now be called multiple times

Browse source 
This makes them work like the close provided by regular file objects.
This commit is contained in:
R David Murray 2011-06-17 22:24:05 -04:00
parent 05ff990401
commit c88bce1580
3 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/mailbox.py
View file

@ -1923,9 +1923,10 @@ class _ProxyFile:
def close(self):
"""Close the file."""
if hasattr(self._file, 'close'):
self._file.close()
del self._file
if hasattr(self, '_file'):
if hasattr(self._file, 'close'):
self._file.close()
del self._file
def _read(self, size, read_method):
"""Read size bytes using read_method."""
@ -1957,6 +1958,10 @@ class _ProxyFile:
@property
def closed(self):
if not hasattr(self, '_file'):
return True
if not hasattr(self._file, 'closed'):
return False
return self._file.closed
@ -1995,7 +2000,8 @@ class _PartialFile(_ProxyFile):
def close(self):
# do *not* close the underlying file object for partial files,
# since it's global to the mailbox object
del self._file
if hasattr(self, '_file'):
del self._file
def _lock_file(f, dotlock=True):