[Python-checkins] cpython (3.5): Issue #28815: Use new exception subclasses
martin.panter
python-checkins at python.org
Sat Jan 7 21:35:07 EST 2017
https://hg.python.org/cpython/rev/5a417e160b34
changeset: 106035:5a417e160b34
branch: 3.5
parent: 106010:999d636c72b4
user: Martin Panter <vadmium+py at gmail.com>
date: Sun Jan 08 00:46:25 2017 +0000
summary:
Issue #28815: Use new exception subclasses
files:
Lib/test/test_socket.py | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -4719,14 +4719,10 @@
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 "):
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list