From: Martin Panter <vadmium+py@gmail.com>
Date: Sun, 8 Jan 2017 00:46:25 +0000 (+0000)
Subject: Issue #28815: Use new exception subclasses
X-Git-Tag: v3.6.1rc1~199^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cbd46f19ffa8b1ac7220fcd1c791ab4cade8e10;p=thirdparty%2FPython%2Fcpython.git

Issue #28815: Use new exception subclasses
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index ea3ca28a3995..70c03f9c468a 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 "):