mirror of
https://github.com/python/cpython.git
synced 2025-11-25 04:34:37 +00:00
Fix a regression in uuid added in bpo-32107. (#4677)
uuid.get_node() always must return a stable result. Also added a test for non-reproducibility of _random_getnode(). Original patch by Xavier de Gaye.
This commit is contained in:
parent
85d5c18c9d
commit
e69fbb6a56
2 changed files with 5 additions and 2 deletions
|
|
@ -674,14 +674,14 @@ def getnode():
|
|||
getters = [_unix_getnode, _ifconfig_getnode, _ip_getnode,
|
||||
_arp_getnode, _lanscan_getnode, _netstat_getnode]
|
||||
|
||||
for getter in getters:
|
||||
for getter in getters + [_random_getnode]:
|
||||
try:
|
||||
_node = getter()
|
||||
except:
|
||||
continue
|
||||
if _node is not None:
|
||||
return _node
|
||||
return _random_getnode()
|
||||
assert False, '_random_getnode() returned None'
|
||||
|
||||
|
||||
_last_timestamp = None
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue