From c6eb7ee3e574b48ee016dd31af2014b0ed083268 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Sat, 30 Apr 2016 13:34:04 -0400
Subject: Use contextlib.suppress() where appropriate.

---
 src/mailman/commands/tests/test_control.py | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'src/mailman/commands/tests/test_control.py')

diff --git a/src/mailman/commands/tests/test_control.py b/src/mailman/commands/tests/test_control.py
index 26d921cd7..7377c4666 100644
--- a/src/mailman/commands/tests/test_control.py
+++ b/src/mailman/commands/tests/test_control.py
@@ -56,22 +56,12 @@ def find_master():
     until = timedelta(seconds=10) + datetime.now()
     while datetime.now() < until:
         time.sleep(0.1)
-        try:
+        with suppress(FileNotFoundError, ValueError, ProcessLookupError):
             with open(config.PID_FILE) as fp:
                 pid = int(fp.read().strip())
                 os.kill(pid, 0)
-        except IOError as error:
-            if error.errno != errno.ENOENT:
-                raise
-        except ValueError:
-            pass
-        except OSError as error:
-            if error.errno != errno.ESRCH:
-                raise
-        else:
-            return pid
-    else:
-        return None
+                return pid
+    return None
 
 
 class FakeArgs:
-- 
cgit v1.2.3-70-g09d2