mirror of https://github.com/python/cpython
gh-98415: Fix uuid.getnode() ifconfig implementation (#98423)
The uuid.getnode() function has multiple implementations, tested sequentially. The ifconfig implementation was incorrect and always failed: fix it. In practice, functions of libuuid library are preferred, if available: uuid_generate_time_safe(), uuid_create() or uuid_generate_time(). Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>
This commit is contained in:
parent
3d889dc0a0
commit
e3ec272f57
|
@ -371,7 +371,12 @@ def _get_command_stdout(command, *args):
|
|||
# for are actually localized, but in theory some system could do so.)
|
||||
env = dict(os.environ)
|
||||
env['LC_ALL'] = 'C'
|
||||
proc = subprocess.Popen((executable,) + args,
|
||||
# Empty strings will be quoted by popen so we should just ommit it
|
||||
if args != ('',):
|
||||
command = (executable, *args)
|
||||
else:
|
||||
command = (executable,)
|
||||
proc = subprocess.Popen(command,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.DEVNULL,
|
||||
env=env)
|
||||
|
@ -511,7 +516,7 @@ def _ifconfig_getnode():
|
|||
mac = _find_mac_near_keyword('ifconfig', args, keywords, lambda i: i+1)
|
||||
if mac:
|
||||
return mac
|
||||
return None
|
||||
return None
|
||||
|
||||
def _ip_getnode():
|
||||
"""Get the hardware address on Unix by running ip."""
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Fix detection of MAC addresses for :mod:`uuid` on certain OSs. Patch by Chaim Sanders
|
Loading…
Reference in New Issue