Merge pull request #14 from zopefoundation/fix-pipetrigger

Fix pipetrigger.close() to close the right file descriptors

CHANGES.rst

@@ -5,6 +5,9 @@
 4.0.2 (unreleased)
 ==================
 
+- Fix pipetrigger.close() to close the right file descriptor.
+  (This could've been causing EBADF errors in unrelated places!)
+
 - Add Python 3.7 support.
 
 

src/zope/server/tests/test_trigger.py

@@ -63,7 +63,7 @@ def test_thunk_error(self):
         def thunk():
             raise Exception("TestException")
         t = self._makeOne()
-        t.close()
+        t.recv = lambda s: ''
         t.thunks.append(thunk)
         trigger.print = buf.write
         try:

src/zope/server/trigger.py

@@ -141,7 +141,7 @@ class pipetrigger(_triggerbase, asyncore.file_dispatcher):
 
         def __init__(self):
             _triggerbase.__init__(self)
-            r, self.trigger = self._fds = os.pipe()
+            r, self.trigger = os.pipe()
             asyncore.file_dispatcher.__init__(self, r)
 
             if self.socket.fd != r:
@@ -154,12 +154,12 @@ def __init__(self):
                 os.close(r)
 
         def _close(self):
-            for fd in self._fds:
-                try:
-                    os.close(fd)
-                except OSError:
-                    pass
-            self._fds = []
+            if self.socket is not None:
+                self.socket.close()
+                self.socket = None
+            if self.trigger is not None:
+                os.close(self.trigger)
+                self.trigger = None
 
         def _physical_pull(self):
             os.write(self.trigger, b'x')