Issue #28815: Merge test tweak from 3.6

This commit is contained in:
Martin Panter 2017-01-08 01:06:48 +00:00
commit 4f5c6a27d8

View file

@ -4798,14 +4798,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.
if e.errno in (errno.ENOENT, errno.EISDIR, errno.EACCES):
return False return False
else:
raise
with f: with f:
for line in f: for line in f:
if line.startswith("tipc "): if line.startswith("tipc "):