diff -r c919a82b5a40 Lib/uuid.py --- a/Lib/uuid.py Mon Mar 14 10:56:33 2011 -0400 +++ b/Lib/uuid.py Mon Mar 14 16:30:11 2011 -0400 @@ -327,8 +327,16 @@ 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) + # 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 + except ValueError: + continue except IOError: continue return None diff -r c919a82b5a40 Misc/ACKS --- a/Misc/ACKS Mon Mar 14 10:56:33 2011 -0400 +++ b/Misc/ACKS Mon Mar 14 16:30:11 2011 -0400 @@ -285,6 +285,7 @@ Doug Fort John Fouhy Martin Franklin +Kent Frazier Robin Friedrich Ivan Frohne Jim Fulton