Issue #28815: Use new exception subclasses

This commit is contained in:
Martin Panter 2017-01-08 00:46:25 +00:00
parent 645bc80918
commit 8cbd46f19f

View File

@ -4719,14 +4719,10 @@ def isTipcAvailable():
return False return False
try: try:
f = open("/proc/modules") 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 # 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 # have not the permission to read it.
# real error, so raise it again. return False
if e.errno in (errno.ENOENT, errno.EISDIR, errno.EACCES):
return False
else:
raise
with f: with f:
for line in f: for line in f:
if line.startswith("tipc "): if line.startswith("tipc "):