[Python-checkins] gh-98415: Fix uuid.getnode() ifconfig implementation (GH-98423)
miss-islington
webhook-mailer at python.org
Wed Nov 2 15:22:25 EDT 2022
https://github.com/python/cpython/commit/c23862fc6c3195eccc3cd71e45d7b336dc0d5d50
commit: c23862fc6c3195eccc3cd71e45d7b336dc0d5d50
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-11-02T12:22:19-07:00
summary:
gh-98415: Fix uuid.getnode() ifconfig implementation (GH-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().
(cherry picked from commit e3ec272f57c3948834a6159cf2604978d3db67a0)
Co-authored-by: Chaim Sanders <csanders-git at users.noreply.github.com>
Co-authored-by: Dong-hee Na <donghee.na92 at gmail.com>
files:
A Misc/NEWS.d/next/Core and Builtins/2022-10-19-01-01-08.gh-issue-98415.ZS2eWh.rst
M Lib/uuid.py
diff --git a/Lib/uuid.py b/Lib/uuid.py
index 5ae0a3e5fa44..fe9f87b79457 100644
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -370,7 +370,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)
@@ -510,7 +515,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
More information about the Python-checkins
mailing list