From: Chaim Sanders Date: Wed, 2 Nov 2022 18:41:20 +0000 (-0700) Subject: gh-98415: Fix uuid.getnode() ifconfig implementation (#98423) X-Git-Tag: v3.12.0a2~159 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e3ec272f57c3948834a6159cf2604978d3db67a0;p=thirdparty%2FPython%2Fcpython.git 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 --- diff --git a/Lib/uuid.py b/Lib/uuid.py index 8fe2479f3f22..e863b631877f 100644 --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -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.""" diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-10-19-01-01-08.gh-issue-98415.ZS2eWh.rst b/Misc/NEWS.d/next/Core and Builtins/2022-10-19-01-01-08.gh-issue-98415.ZS2eWh.rst new file mode 100644 index 000000000000..af2db1f9965c --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2022-10-19-01-01-08.gh-issue-98415.ZS2eWh.rst @@ -0,0 +1 @@ +Fix detection of MAC addresses for :mod:`uuid` on certain OSs. Patch by Chaim Sanders