traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #28815: Merge test tweak from 3.5

This commit is contained in:
Martin Panter 2017-01-08 01:06:18 +00:00
parent 0b64a0fc64 8cbd46f19f
commit 625fb648f7
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_socket.py
View File

@ -4780,14 +4780,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 "):