Serhiy Storchaka added the comment:
> You probably forgot to attach the patch...
Indeed. :-(
----------
Added file: http://bugs.python.org/file36993/uuid_netstat_getnode-3.5.patch
_______________________________________
Python tracker <rep...@bugs.python.org>
<http://bugs.python.org/issue17293>
_______________________________________
diff -r f2ce9603346c Lib/test/test_uuid.py
--- a/Lib/test/test_uuid.py Wed Oct 22 12:33:23 2014 +0200
+++ b/Lib/test/test_uuid.py Wed Oct 22 21:54:25 2014 +0300
@@ -320,6 +320,24 @@ class TestUUID(unittest.TestCase):
if node is not None:
self.check_node(node, 'ifconfig')
+ @unittest.skipUnless(os.name == 'posix', 'requires Posix')
+ def test_arp_getnode(self):
+ node = uuid._arp_getnode()
+ if node is not None:
+ self.check_node(node, 'arp')
+
+ @unittest.skipUnless(os.name == 'posix', 'requires Posix')
+ def test_lanscan_getnode(self):
+ node = uuid._lanscan_getnode()
+ if node is not None:
+ self.check_node(node, 'lanscan')
+
+ @unittest.skipUnless(os.name == 'posix', 'requires Posix')
+ def test_netstat_getnode(self):
+ node = uuid._netstat_getnode()
+ if node is not None:
+ self.check_node(node, 'netstat')
+
@unittest.skipUnless(os.name == 'nt', 'requires Windows')
def test_ipconfig_getnode(self):
node = uuid._ipconfig_getnode()
diff -r f2ce9603346c Lib/uuid.py
--- a/Lib/uuid.py Wed Oct 22 12:33:23 2014 +0200
+++ b/Lib/uuid.py Wed Oct 22 21:54:25 2014 +0300
@@ -304,7 +304,7 @@ class UUID(object):
if self.variant == RFC_4122:
return int((self.int >> 76) & 0xf)
-def _find_mac(command, arg, hw_identifiers, get_index):
+def _popen(command, *args):
import os, shutil, subprocess
executable = shutil.which(command)
if executable is None:
@@ -312,20 +312,23 @@ def _find_mac(command, arg, hw_identifie
executable = shutil.which(command, path=path)
if executable is None:
return None
+ # LC_ALL=C to ensure English output, stderr=DEVNULL to prevent output
+ # on stderr (Note: we don't have an example where the words we search
+ # 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,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.DEVNULL,
+ env=env)
+ return proc
+def _find_mac(command, arg, hw_identifiers, get_index):
try:
- # LC_ALL=C to ensure English output, stderr=DEVNULL to prevent output
- # on stderr (Note: we don't have an example where the words we search
- # for are actually localized, but in theory some system could do so.)
- env = dict(os.environ)
- env['LC_ALL'] = 'C'
- cmd = [executable]
- if arg:
- cmd.append(arg)
- proc = subprocess.Popen(cmd,
- stdout=subprocess.PIPE,
- stderr=subprocess.DEVNULL,
- env=env)
+ args = (arg,) if arg else ()
+ proc = _popen(command, *args)
+ if not proc:
+ return
with proc:
for line in proc.stdout:
words = line.lower().split()
@@ -346,27 +349,45 @@ def _find_mac(command, arg, hw_identifie
def _ifconfig_getnode():
"""Get the hardware address on Unix by running ifconfig."""
-
# This works on Linux ('' or '-a'), Tru64 ('-av'), but not all Unixes.
for args in ('', '-a', '-av'):
mac = _find_mac('ifconfig', args, [b'hwaddr', b'ether'], lambda i: i+1)
if mac:
return mac
- import socket
+def _arp_getnode():
+ """Get the hardware address on Unix by running arp."""
+ import os, socket
ip_addr = socket.gethostbyname(socket.gethostname())
# Try getting the MAC addr from arp based on our IP address (Solaris).
- mac = _find_mac('arp', '-an', [os.fsencode(ip_addr)], lambda i: -1)
- if mac:
- return mac
+ return _find_mac('arp', '-an', [os.fsencode(ip_addr)], lambda i: -1) or
None
+def _lanscan_getnode():
+ """Get the hardware address on Unix by running lanscan."""
# This might work on HP-UX.
- mac = _find_mac('lanscan', '-ai', [b'lan0'], lambda i: 0)
- if mac:
- return mac
+ return _find_mac('lanscan', '-ai', [b'lan0'], lambda i: 0) or None
- return None
+def _netstat_getnode():
+ """Get the hardware address on Unix by running netstat."""
+ # This might work on AIX, Tru64 UNIX and presumably on IRIX.
+ try:
+ proc = _popen('netstat', '-ia')
+ if not proc:
+ return
+ with proc:
+ words = proc.stdout.readline().split()
+ i = words.index('Address')
+ for line in proc.stdout:
+ try:
+ words = line.split()
+ word = words[i]
+ if len(word) == 17 and word.count(':') == 5:
+ return int(word.replace(':', ''), 16)
+ except (ValueError, IndexError):
+ pass
+ except (OSError, ValueError):
+ pass
def _ipconfig_getnode():
"""Get the hardware address on Windows by running ipconfig.exe."""
@@ -508,7 +529,8 @@ def getnode():
if sys.platform == 'win32':
getters = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
else:
- getters = [_unixdll_getnode, _ifconfig_getnode]
+ getters = [_unixdll_getnode, _ifconfig_getnode, _arp_getnode,
+ _lanscan_getnode, _netstat_getnode]
for getter in getters + [_random_getnode]:
try:
_______________________________________________
Python-bugs-list mailing list
Unsubscribe:
https://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
