mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

#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
patch also backports the close-the-underlying-file code for _ProxyFile objects
that was introduced along with context manager support in the 3.x branch.
This commit is contained in:
R David Murray 2011-06-17 22:23:04 -04:00
parent c74a6ba2d6
commit f1138bb1b6
3 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/mailbox.py
View file

@ -1854,7 +1854,10 @@ class _ProxyFile:
def close(self):
"""Close the file."""
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."""
@ -1898,6 +1901,12 @@ class _PartialFile(_ProxyFile):
size = remaining
return _ProxyFile._read(self, size, read_method)
def close(self):
# do *not* close the underlying file object for partial files,
# since it's global to the mailbox object
if hasattr(self, '_file'):
del self._file
def _lock_file(f, dotlock=True):
"""Lock file f using lockf and dot locking."""