mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with

Browse source 
virtual interface.  Original patch by Kent Frazier.
This commit is contained in:
Serhiy Storchaka 2013-11-26 22:49:36 +02:00
commit 822963ed5d
4 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/uuid.py
View file

@ -327,8 +327,16 @@ def _find_mac(command, args, hw_identifiers, get_index):
words = line.lower().split()
for i in range(len(words)):
if words[i] in hw_identifiers:
return int(
words[get_index(i)].replace(':', ''), 16)
try:
return int(
words[get_index(i)].replace(':', ''), 16)
except (ValueError, IndexError):
# Virtual interfaces, such as those provided by
# VPNs, do not have a colon-delimited MAC address
# as expected, but a 16-byte HWAddr separated by
# dashes. These should be ignored in favor of a
# real MAC address
pass
except OSError:
continue
return None