commit c88bce1580c61ee33bf72e55b817940dba46d99c
author R David Murray <rdmurray@bitdance.com> Fri Jun 17 22:24:05 2011 -0400
committer R David Murray <rdmurray@bitdance.com> Fri Jun 17 22:24:05 2011 -0400
tree b2326ab96c8d50fda11c4db71e1827cc3c9ccfa9
parent 05ff9904010a488cc640637ac8255cae41b270dd

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

This makes them work like the close provided by regular file objects.

Lib/mailbox.py

diff --git a/Lib/mailbox.py b/Lib/mailbox.py
index b96b270..e23ea8c 100644
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -1923,9 +1923,10 @@
 
     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 @@
 
     @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 @@
     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):