diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2015-04-10 10:29:28 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-04-10 10:29:28 (GMT) |
| commit | 2116b12da59f77358cc539b90f58a3cdea43c2fd (patch) | |
| tree | 693d26652b1dbf8b2ac058c5725f9726c3d14a0b /Lib/selectors.py | |
| parent | fcbf8f3e3d46eb023dd9a3954c6f9ed9a533d427 (diff) | |
| parent | 7e7a3dba5fd4262269f713dfe21ba7e4746fc2dd (diff) | |
| download | cpython-2116b12da59f77358cc539b90f58a3cdea43c2fd.zip cpython-2116b12da59f77358cc539b90f58a3cdea43c2fd.tar.gz cpython-2116b12da59f77358cc539b90f58a3cdea43c2fd.tar.bz2 | |
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.
Diffstat (limited to 'Lib/selectors.py')
| -rw-r--r-- | Lib/selectors.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Lib/selectors.py b/Lib/selectors.py index 44a6150..e17ea36 100644 --- a/Lib/selectors.py +++ b/Lib/selectors.py @@ -439,8 +439,10 @@ if hasattr(select, 'epoll'): return ready def close(self): - self._epoll.close() - super().close() + try: + self._epoll.close() + finally: + super().close() if hasattr(select, 'devpoll'): @@ -496,8 +498,10 @@ if hasattr(select, 'devpoll'): return ready def close(self): - self._devpoll.close() - super().close() + try: + self._devpoll.close() + finally: + super().close() if hasattr(select, 'kqueue'): @@ -566,8 +570,10 @@ if hasattr(select, 'kqueue'): return ready def close(self): - self._kqueue.close() - super().close() + try: + self._kqueue.close() + finally: + super().close() # Choose the best implementation, roughly: |