bpo-28009: Fix uuid.uuid1() and uuid.get_node() on AIX

Lib/test/test_uuid.py

@@ -6,11 +6,13 @@
 import os
 import shutil
 import subprocess
+import sys
+
+_notAIX = not sys.platform.startswith("aix")
 
 py_uuid = support.import_fresh_module('uuid', blocked=['_uuid'])
 c_uuid = support.import_fresh_module('uuid', fresh=['_uuid'])
 
-
 def importable(name):
     try:
         __import__(name)
@@ -516,10 +518,17 @@ class BaseTestInternals:
 
     @unittest.skipUnless(os.name == 'posix', 'requires Posix')
     def test_find_mac(self):
-        data = '''
+        if _notAIX:
+            data = '''
 fake hwaddr
 cscotun0  Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
 eth0      Link encap:Ethernet  HWaddr 12:34:56:78:90:ab
+'''
+        else:
+            data = '''
+fake hwaddr
+cscotun0  Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+eth0      Link encap:Ethernet  HWaddr 12.34.56.78.90.ab
 '''
 
         popen = unittest.mock.MagicMock()
@@ -549,7 +558,10 @@ def check_node(self, node, requires=None):
 
     @unittest.skipUnless(os.name == 'posix', 'requires Posix')
     def test_ifconfig_getnode(self):
-        node = self.uuid._ifconfig_getnode()
+        if _notAIX:
+            node = self.uuid._ifconfig_getnode()
+        else:
+            self.skipTest('because AIX "ifconfig" does not provide macaddr')
         self.check_node(node, 'ifconfig')
 
     @unittest.skipUnless(os.name == 'posix', 'requires Posix')
@@ -559,7 +571,10 @@ def test_ip_getnode(self):
 
     @unittest.skipUnless(os.name == 'posix', 'requires Posix')
     def test_arp_getnode(self):
-        node = self.uuid._arp_getnode()
+        if _notAIX:
+            node = self.uuid._arp_getnode()
+        else:
+            self.skipTest('because AIX "arp" does not provide macaddr')
         self.check_node(node, 'arp')
 
     @unittest.skipUnless(os.name == 'posix', 'requires Posix')

Lib/uuid.py

@@ -52,6 +52,9 @@
 
 __author__ = 'Ka-Ping Yee <ping@zesty.ca>'
 
+_notAIX = not sys.platform.startswith("aix")
+_mac_delim =  b':' if _notAIX else b'.'
+
 RESERVED_NCS, RFC_4122, RESERVED_MICROSOFT, RESERVED_FUTURE = [
     'reserved for NCS compatibility', 'specified in RFC 4122',
     'reserved for Microsoft compatibility', 'reserved for future definition']
@@ -373,7 +376,7 @@ def _find_mac(command, args, hw_identifiers, get_index):
                     if words[i] in hw_identifiers:
                         try:
                             word = words[get_index(i)]
-                            mac = int(word.replace(b':', b''), 16)
+                            mac = int(word.replace(_mac_delim, b''), 16)
                             if _is_universal(mac):
                                 return mac
                             first_local_mac = first_local_mac or mac
@@ -455,8 +458,15 @@ def _netstat_getnode():
                 try:
                     words = line.rstrip().split()
                     word = words[i]
-                    if len(word) == 17 and word.count(b':') == 5:
-                        mac = int(word.replace(b':', b''), 16)
+                    if word.count(_mac_delim) == 5:
+                        if len(word) == 17:
+                            mac = int(word.replace(_mac_delim, b''), 16)
+                        elif len(word) < 17 and len(word) >= 11:
+                            mac = 0
+                            hexs = word.split(_mac_delim)
+                            for hex in hexs:
+                                mac <<= 8
+                                mac += int(hex, 16)
                         if _is_universal(mac):
                             return mac
                         first_local_mac = first_local_mac or mac
@@ -663,6 +673,8 @@ def _random_getnode():
 _NODE_GETTERS_UNIX = [_unix_getnode, _ifconfig_getnode, _ip_getnode,
                       _arp_getnode, _lanscan_getnode, _netstat_getnode]
 
+_NODE_GETTERS_AIX = [_unix_getnode, _netstat_getnode]
+
 def getnode(*, getters=None):
     """Get the hardware address as a 48-bit positive integer.
 
@@ -678,7 +690,7 @@ def getnode(*, getters=None):
     if sys.platform == 'win32':
         getters = _NODE_GETTERS_WIN32
     else:
-        getters = _NODE_GETTERS_UNIX
+        getters = _NODE_GETTERS_UNIX if _notAIX else _NODE_GETTERS_AIX
 
     for getter in getters + [_random_getnode]:
         try:

Misc/NEWS.d/next/Library/2018-08-04-12-26-11.bpo-28009.4JcHZb.rst

@@ -0,0 +1 @@
+uuid: correct the field seperator (_mac_field) value of an ethernet adapter MAC address for AIX