(Merge 3.4) Issue #11453: asyncore: emit a ResourceWarning when an unclosed

file_wrapper object is destroyed. The destructor now closes the file if needed.
The close() method can now be called twice: the second call does nothing.

1 files changed, 8 insertions, 0 deletions

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index 37efa9bac4..b2ee27817f 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -600,6 +600,11 @@ if os.name == 'posix':
         def __init__(self, fd):
             self.fd = os.dup(fd)
 
+        def __del__(self):
+            if self.fd >= 0:
+                warnings.warn("unclosed file %r" % self, ResourceWarning)
+            self.close()
+
         def recv(self, *args):
             return os.read(self.fd, *args)
 
@@ -618,7 +623,10 @@ if os.name == 'posix':
         write = send
 
         def close(self):
+            if self.fd < 0:
+                return
             os.close(self.fd)
+            self.fd = -1
 
         def fileno(self):
             return self.fd