mirror of
https://github.com/python/cpython.git
synced 2025-09-30 20:31:52 +00:00
[3.6] pythoninfo: ignore OSError(ENOSYS) on getrandom() (GH-3655) (#3657)
(cherry picked from commit a92941ff12
)
This commit is contained in:
parent
f37dd11f0d
commit
72c05e31d6
1 changed files with 12 additions and 5 deletions
|
@ -2,6 +2,7 @@
|
||||||
Collect various informations about Python to help debugging test failures.
|
Collect various informations about Python to help debugging test failures.
|
||||||
"""
|
"""
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
|
import errno
|
||||||
import re
|
import re
|
||||||
import sys
|
import sys
|
||||||
import traceback
|
import traceback
|
||||||
|
@ -223,11 +224,17 @@ def collect_os(info_add):
|
||||||
if hasattr(os, 'getrandom'):
|
if hasattr(os, 'getrandom'):
|
||||||
# PEP 524: Check if system urandom is initialized
|
# PEP 524: Check if system urandom is initialized
|
||||||
try:
|
try:
|
||||||
os.getrandom(1, os.GRND_NONBLOCK)
|
try:
|
||||||
state = 'ready (initialized)'
|
os.getrandom(1, os.GRND_NONBLOCK)
|
||||||
except BlockingIOError as exc:
|
state = 'ready (initialized)'
|
||||||
state = 'not seeded yet (%s)' % exc
|
except BlockingIOError as exc:
|
||||||
info_add('os.getrandom', state)
|
state = 'not seeded yet (%s)' % exc
|
||||||
|
info_add('os.getrandom', state)
|
||||||
|
except OSError as exc:
|
||||||
|
# Python was compiled on a more recent Linux version
|
||||||
|
# than the current Linux kernel: ignore OSError(ENOSYS)
|
||||||
|
if exc.errno != errno.ENOSYS:
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
def collect_readline(info_add):
|
def collect_readline(info_add):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue