From 8cbd46f19ffa8b1ac7220fcd1c791ab4cade8e10 Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Sun, 8 Jan 2017 00:46:25 +0000 Subject: [PATCH] Issue #28815: Use new exception subclasses --- Lib/test/test_socket.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index ea3ca28a399..70c03f9c468 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -4719,14 +4719,10 @@ def isTipcAvailable(): return False try: f = open("/proc/modules") - except IOError as e: + except (FileNotFoundError, IsADirectoryError, PermissionError): # It's ok if the file does not exist, is a directory or if we - # have not the permission to read it. In any other case it's a - # real error, so raise it again. - if e.errno in (errno.ENOENT, errno.EISDIR, errno.EACCES): - return False - else: - raise + # have not the permission to read it. + return False with f: for line in f: if line.startswith("tipc "):