summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2017-01-08 00:46:25 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2017-01-08 00:46:25 (GMT)
commit8cbd46f19ffa8b1ac7220fcd1c791ab4cade8e10 (patch)
tree0aeca637c8506b102d023cead1399d6dcac9b322
parent645bc80918e6e500bca5652b39175923dd19099f (diff)
downloadcpython-8cbd46f19ffa8b1ac7220fcd1c791ab4cade8e10.zip
cpython-8cbd46f19ffa8b1ac7220fcd1c791ab4cade8e10.tar.gz
cpython-8cbd46f19ffa8b1ac7220fcd1c791ab4cade8e10.tar.bz2
Issue #28815: Use new exception subclasses
-rw-r--r--Lib/test/test_socket.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index ea3ca28..70c03f9 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 "):