traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #19720: Suppressed context for some exceptions in importlib.

This commit is contained in:
Serhiy Storchaka 2014-11-21 21:56:57 +02:00
parent c4464052d9 525d5aeaae
commit fc9fdedd09
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/uuid.py
View File

@ -359,7 +359,10 @@ def _ifconfig_getnode():
def _arp_getnode(): def _arp_getnode():
"""Get the hardware address on Unix by running arp.""" """Get the hardware address on Unix by running arp."""
import os, socket import os, socket
try:
ip_addr = socket.gethostbyname(socket.gethostname()) ip_addr = socket.gethostbyname(socket.gethostname())
except OSError:
return None
# Try getting the MAC addr from arp based on our IP address (Solaris). # Try getting the MAC addr from arp based on our IP address (Solaris).
return _find_mac('arp', '-an', [os.fsencode(ip_addr)], lambda i: -1) return _find_mac('arp', '-an', [os.fsencode(ip_addr)], lambda i: -1)