#30624 / selectors: use bare except clause in order to not leave the …

…fd in a bad state in case of error (#2082)
python · Jun 10, 2017 · 05dc20f · 05dc20f
1 parent 6b6e687
commit 05dc20f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Lib/selectors.py b/Lib/selectors.py
@@ -387,7 +387,7 @@ def modify(self, fileobj, events, data=None):
                 selector_events |= self._EVENT_WRITE
             try:
                 self._selector.modify(key.fd, selector_events)
-            except Exception:
+            except:
                 super().unregister(fileobj)
                 raise
             changed = True
@@ -524,7 +524,7 @@ def register(self, fileobj, events, data=None):
                     kev = select.kevent(key.fd, select.KQ_FILTER_WRITE,
                                         select.KQ_EV_ADD)
                     self._selector.control([kev], 0, 0)
-            except Exception:
+            except:
                 super().unregister(fileobj)
                 raise
             return key

diff --git a/Misc/NEWS b/Misc/NEWS
@@ -350,6 +350,10 @@ Extension Modules
 Library
 -------
 
+- bpo-30624: selectors does not take KeyboardInterrupt and SystemExit into
+  account, leaving a fd in a bad state in case of error. Patch by Giampaolo
+  Rodola'.
+
 - bpo-30595: multiprocessing.Queue.get() with a timeout now polls its reader in
   non-blocking mode if it succeeded to aquire the lock but the acquire took
   longer than the timeout.