Issue #28815: Merge test tweak from 3.6
This commit is contained in:
commit
4f5c6a27d8
|
@ -4798,14 +4798,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 "):
|
||||
|
|
Loading…
Reference in New Issue