From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 30 Nov 2014 18:39:04 +0000 (+0200)
Subject: Issue #22902: The "ip" command is now used on Linux to determine MAC address
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac4aa7b6aad76b404ed1e695b3130988d87fb39f;p=python

Issue #22902: The "ip" command is now used on Linux to determine MAC address
in uuid.getnode().  Pach by Bruno Cauet.
---

diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py
index bfa9f973d7..bc83de2211 100644
--- a/Lib/test/test_uuid.py
+++ b/Lib/test/test_uuid.py
@@ -320,6 +320,12 @@ class TestUUID(unittest.TestCase):
         if node is not None:
             self.check_node(node, 'ifconfig')
 
+    @unittest.skipUnless(os.name == 'posix', 'requires Posix')
+    def test_ip_getnode(self):
+        node = uuid._ip_getnode()
+        if node is not None:
+            self.check_node(node, 'ip')
+
     @unittest.skipUnless(os.name == 'posix', 'requires Posix')
     def test_arp_getnode(self):
         node = uuid._arp_getnode()
diff --git a/Lib/uuid.py b/Lib/uuid.py
index 9c2a971ae5..7b0b413966 100644
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -356,6 +356,13 @@ def _ifconfig_getnode():
         if mac:
             return mac
 
+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)
+    if mac:
+        return mac
+
 def _arp_getnode():
     """Get the hardware address on Unix by running arp."""
     import os, socket
@@ -538,8 +545,8 @@ def getnode():
     if sys.platform == 'win32':
         getters = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
     else:
-        getters = [_unixdll_getnode, _ifconfig_getnode, _arp_getnode,
-                   _lanscan_getnode, _netstat_getnode]
+        getters = [_unixdll_getnode, _ifconfig_getnode, _ip_getnode,
+                   _arp_getnode, _lanscan_getnode, _netstat_getnode]
 
     for getter in getters + [_random_getnode]:
         try:
diff --git a/Misc/ACKS b/Misc/ACKS
index 3d4094cd13..eae72c7591 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -217,6 +217,7 @@ Pierre Carrier
 Terry Carroll
 Edward Catmur
 Lorenzo M. Catucci
+Bruno Cauet
 Donn Cave
 Charles Cazabon
 Jesús Cea Avión
diff --git a/Misc/NEWS b/Misc/NEWS
index 7e568c6503..8fb14e0a4f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -191,6 +191,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #22902: The "ip" command is now used on Linux to determine MAC address
+  in uuid.getnode().  Pach by Bruno Cauet.
+
 - Issue #22960: Add a context argument to xmlrpclib.ServerProxy constructor.
 
 - Issue #22389: Add contextlib.redirect_stderr().