From 7e7a3dba5fd4262269f713dfe21ba7e4746fc2dd Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 10 Apr 2015 13:24:41 +0300
Subject: Issue #23865: close() methods in multiple modules now are idempotent
 and more robust at shutdown. If needs to release multiple resources, they are
 released even if errors are occured.

---
 Lib/multiprocessing/queues.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'Lib/multiprocessing/queues.py')

diff --git a/Lib/multiprocessing/queues.py b/Lib/multiprocessing/queues.py
index c91535dd543..293ad7673c6 100644
--- a/Lib/multiprocessing/queues.py
+++ b/Lib/multiprocessing/queues.py
@@ -133,9 +133,13 @@ class Queue(object):
 
     def close(self):
         self._closed = True
-        self._reader.close()
-        if self._close:
-            self._close()
+        try:
+            self._reader.close()
+        finally:
+            close = self._close
+            if close:
+                self._close = None
+                close()
 
     def join_thread(self):
         debug('Queue.join_thread()')
-- 
cgit v1.2.3