1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gh-98415: Fix uuid.getnode() ifconfig implementation (#98423)

Browse Source 
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:
Chaim Sanders 2022-11-02 11:41:20 -07:00 committed by GitHub
parent 3d889dc0a0
commit e3ec272f57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/uuid.py
View File

@ -371,7 +371,12 @@ def _get_command_stdout(command, *args):
# for are actually localized, but in theory some system could do so.) # for are actually localized, but in theory some system could do so.)
env = dict(os.environ) env = dict(os.environ)
env['LC_ALL'] = 'C' 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, stdout=subprocess.PIPE,
stderr=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
env=env) env=env)
@ -511,7 +516,7 @@ def _ifconfig_getnode():
mac = _find_mac_near_keyword('ifconfig', args, keywords, lambda i: i+1) mac = _find_mac_near_keyword('ifconfig', args, keywords, lambda i: i+1)
if mac: if mac:
return mac return mac
return None return None
def _ip_getnode(): def _ip_getnode():
"""Get the hardware address on Unix by running ip.""" """Get the hardware address on Unix by running ip."""

1
Misc/NEWS.d/next/Core and Builtins/2022-10-19-01-01-08.gh-issue-98415.ZS2eWh.rst Normal file
View File

@ -0,0 +1 @@
Fix detection of MAC addresses for :mod:`uuid` on certain OSs. Patch by Chaim Sanders