summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxdegaye <xdegaye@gmail.com>2017-12-07 12:59:13 +0100
committerGitHub <noreply@github.com>2017-12-07 12:59:13 +0100
commit961dbe0548e26394b7716d41423c61b1e2e58ef7 (patch)
tree6bbf813d3d61280463c5f56ab8a5e63f07c8fc8e
parentfb77e0d855e841f42c3fa504efe79eefca9efafb (diff)
downloadcpython-git-961dbe0548e26394b7716d41423c61b1e2e58ef7.tar.gz
bpo-32199: The getnode() ip getter now uses 'ip link' instead of 'ip link list' (GH-4696)
-rw-r--r--Lib/uuid.py2
-rw-r--r--Misc/NEWS.d/next/Library/2017-12-04-12-23-26.bpo-32199.nGof4v.rst1
2 files changed, 2 insertions, 1 deletions
diff --git a/Lib/uuid.py b/Lib/uuid.py
index be06a6eff3..b7433cb719 100644
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -401,7 +401,7 @@ def _ifconfig_getnode():
def _ip_getnode():
"""Get the hardware address on Unix by running ip."""
# This works on Linux with iproute2.
- mac = _find_mac('ip', 'link list', [b'link/ether'], lambda i: i+1)
+ mac = _find_mac('ip', 'link', [b'link/ether'], lambda i: i+1)
if mac:
return mac
return None
diff --git a/Misc/NEWS.d/next/Library/2017-12-04-12-23-26.bpo-32199.nGof4v.rst b/Misc/NEWS.d/next/Library/2017-12-04-12-23-26.bpo-32199.nGof4v.rst
new file mode 100644
index 0000000000..d5f88cef5c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-12-04-12-23-26.bpo-32199.nGof4v.rst
@@ -0,0 +1 @@
+The getnode() ip getter now uses 'ip link' instead of 'ip link list'.