Mailman 3 November 2013 - Python-checkins

cpython (merge 3.3 -> default): Merge with 3.3
by zach.ware Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/dc1eeca2dfb0 changeset: 87602:dc1eeca2dfb0 parent: 87601:eb307288ffb8 parent: 87600:b8d606c62d68 user: Zachary Ware <zachary.ware(a)gmail.com> date: Tue Nov 26 14:58:10 2013 -0600 summary: Merge with 3.3 files: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge default -> default): Merge heads
by zach.ware Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/eb307288ffb8 changeset: 87601:eb307288ffb8 parent: 87598:28ec217ce510 parent: 87595:efd0e6d675ff user: Zachary Ware <zachary.ware(a)gmail.com> date: Tue Nov 26 14:57:45 2013 -0600 summary: Merge heads files: Lib/test/test_uuid.py | 21 +++++++++++++++++++++ Lib/uuid.py | 12 ++++++++++-- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -1,5 +1,7 @@ import unittest +from test import support import builtins +import io import os import uuid @@ -356,6 +358,25 @@ self.assertEqual(node1, node2) + def test_find_mac(self): + 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 +''' + def mock_popen(cmd): + return io.StringIO(data) + + with support.swap_attr(os, 'popen', mock_popen): + mac = uuid._find_mac( + command='ifconfig', + args='', + hw_identifiers=['hwaddr'], + get_index=lambda x: x + 1, + ) + self.assertEqual(mac, 0x1234567890ab) + @unittest.skipUnless(importable('ctypes'), 'requires ctypes') def test_uuid1(self): equal = self.assertEqual diff --git a/Lib/uuid.py b/Lib/uuid.py --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -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) + 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 diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -407,6 +407,7 @@ Andrew Francis Stefan Franke Martin Franklin +Kent Frazier Bruce Frederiksen Robin Friedrich Bradley Froehle diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -16,6 +16,9 @@ Library ------- +- Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with + virtual interface. Original patch by Kent Frazier. + - Issue #11489: JSON decoder now accepts lone surrogates. - Issue #19545: Avoid chained exceptions while passing stray % to -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> 3.3): Merge heads
by zach.ware Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/b8d606c62d68 changeset: 87600:b8d606c62d68 branch: 3.3 parent: 87597:c65882d79c5f parent: 87594:a5c26e57f429 user: Zachary Ware <zachary.ware(a)gmail.com> date: Tue Nov 26 14:57:10 2013 -0600 summary: Merge heads files: Lib/test/test_uuid.py | 21 +++++++++++++++++++++ Lib/uuid.py | 12 ++++++++++-- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -1,5 +1,7 @@ import unittest +from test import support import builtins +import io import os import uuid @@ -356,6 +358,25 @@ self.assertEqual(node1, node2) + def test_find_mac(self): + 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 +''' + def mock_popen(cmd): + return io.StringIO(data) + + with support.swap_attr(os, 'popen', mock_popen): + mac = uuid._find_mac( + command='ifconfig', + args='', + hw_identifiers=['hwaddr'], + get_index=lambda x: x + 1, + ) + self.assertEqual(mac, 0x1234567890ab) + @unittest.skipUnless(importable('ctypes'), 'requires ctypes') def test_uuid1(self): equal = self.assertEqual diff --git a/Lib/uuid.py b/Lib/uuid.py --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -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) + 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 IOError: continue return None diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -394,6 +394,7 @@ Andrew Francis Stefan Franke Martin Franklin +Kent Frazier Bruce Frederiksen Robin Friedrich Bradley Froehle diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -16,6 +16,9 @@ Library ------- +- Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with + virtual interface. Original patch by Kent Frazier. + - Issue #11489: JSON decoder now accepts lone surrogates. - Issue #19545: Avoid chained exceptions while passing stray % to -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 2.7 -> 2.7): Merge heads
by zach.ware Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/cbf30e9aa586 changeset: 87599:cbf30e9aa586 branch: 2.7 parent: 87596:c8e138646be1 parent: 87593:72951ffbdc76 user: Zachary Ware <zachary.ware(a)gmail.com> date: Tue Nov 26 14:55:46 2013 -0600 summary: Merge heads files: Lib/test/test_uuid.py | 20 ++++++++++++++++++++ Lib/uuid.py | 12 ++++++++++-- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -1,5 +1,6 @@ import unittest from test import test_support +import io import os import uuid @@ -346,6 +347,25 @@ self.assertEqual(node1, node2) + def test_find_mac(self): + 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 +''' + def mock_popen(cmd): + return io.BytesIO(data) + + with test_support.swap_attr(os, 'popen', mock_popen): + mac = uuid._find_mac( + command='ifconfig', + args='', + hw_identifiers=['hwaddr'], + get_index=lambda x: x + 1, + ) + self.assertEqual(mac, 0x1234567890ab) + @unittest.skipUnless(importable('ctypes'), 'requires ctypes') def test_uuid1(self): equal = self.assertEqual diff --git a/Lib/uuid.py b/Lib/uuid.py --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -307,8 +307,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) + 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 IOError: continue return None diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -324,6 +324,7 @@ John Fouhy Stefan Franke Martin Franklin +Kent Frazier Bruce Frederiksen Robin Friedrich Bradley Froehle diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,6 +15,9 @@ Library ------- +- Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with + virtual interface. Original patch by Kent Frazier. + - Issue #11489: JSON decoder now accepts lone surrogates. - Fix test.test_support.bind_port() to not cause an error when Python was -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Issue #19588: Merge with 3.3
by zach.ware Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/28ec217ce510 changeset: 87598:28ec217ce510 parent: 87592:08bcbc210a0f parent: 87597:c65882d79c5f user: Zachary Ware <zachary.ware(a)gmail.com> date: Tue Nov 26 14:54:21 2013 -0600 summary: Issue #19588: Merge with 3.3 files: Lib/test/test_random.py | 12 ++++++------ Misc/ACKS | 1 + Misc/NEWS | 6 ++++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -240,10 +240,10 @@ def test_bigrand_ranges(self): for i in [40,80, 160, 200, 211, 250, 375, 512, 550]: - start = self.gen.randrange(2 ** i) - stop = self.gen.randrange(2 ** (i-2)) + start = self.gen.randrange(2 ** (i-2)) + stop = self.gen.randrange(2 ** i) if stop <= start: - return + continue self.assertTrue(start <= self.gen.randrange(start, stop) < stop) def test_rangelimits(self): @@ -432,10 +432,10 @@ def test_bigrand_ranges(self): for i in [40,80, 160, 200, 211, 250, 375, 512, 550]: - start = self.gen.randrange(2 ** i) - stop = self.gen.randrange(2 ** (i-2)) + start = self.gen.randrange(2 ** (i-2)) + stop = self.gen.randrange(2 ** i) if stop <= start: - return + continue self.assertTrue(start <= self.gen.randrange(start, stop) < stop) def test_rangelimits(self): diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -449,6 +449,7 @@ Jonathan Giddy Johannes Gijsbers Michael Gilfix +Julian Gindi Yannick Gingras Matt Giuca Wim Glenn diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -21,6 +21,12 @@ - Issue #19545: Avoid chained exceptions while passing stray % to time.strptime(). Initial patch by Claudiu Popa. +Tests +----- + +- Issue #19588: Fixed tests in test_random that were silently skipped most + of the time. Patch by Julian Gindi. + What's New in Python 3.4.0 Beta 1? ================================== -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #19588: Fixed tests in test_random that were silently skipped most
by zach.ware Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/c65882d79c5f changeset: 87597:c65882d79c5f branch: 3.3 parent: 87591:8662734296a0 user: Zachary Ware <zachary.ware(a)gmail.com> date: Tue Nov 26 14:50:10 2013 -0600 summary: Issue #19588: Fixed tests in test_random that were silently skipped most of the time. Patch by Julian Gindi. files: Lib/test/test_random.py | 12 ++++++------ Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -194,10 +194,10 @@ def test_bigrand_ranges(self): for i in [40,80, 160, 200, 211, 250, 375, 512, 550]: - start = self.gen.randrange(2 ** i) - stop = self.gen.randrange(2 ** (i-2)) + start = self.gen.randrange(2 ** (i-2)) + stop = self.gen.randrange(2 ** i) if stop <= start: - return + continue self.assertTrue(start <= self.gen.randrange(start, stop) < stop) def test_rangelimits(self): @@ -357,10 +357,10 @@ def test_bigrand_ranges(self): for i in [40,80, 160, 200, 211, 250, 375, 512, 550]: - start = self.gen.randrange(2 ** i) - stop = self.gen.randrange(2 ** (i-2)) + start = self.gen.randrange(2 ** (i-2)) + stop = self.gen.randrange(2 ** i) if stop <= start: - return + continue self.assertTrue(start <= self.gen.randrange(start, stop) < stop) def test_rangelimits(self): diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -435,6 +435,7 @@ Jonathan Giddy Johannes Gijsbers Michael Gilfix +Julian Gindi Yannick Gingras Matt Giuca Wim Glenn diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -65,6 +65,9 @@ Tests ----- +- Issue #19588: Fixed tests in test_random that were silently skipped most + of the time. Patch by Julian Gindi. + - Issue #19596: Set untestable tests in test_importlib to None to avoid reporting success on empty tests. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #19588: Fixed tests in test_random that were silently skipped most
by zach.ware Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/c8e138646be1 changeset: 87596:c8e138646be1 branch: 2.7 parent: 87587:c85305a54e6d user: Zachary Ware <zachary.ware(a)gmail.com> date: Tue Nov 26 14:49:42 2013 -0600 summary: Issue #19588: Fixed tests in test_random that were silently skipped most of the time. Patch by Julian Gindi. files: Lib/test/test_random.py | 12 ++++++------ Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -251,10 +251,10 @@ def test_bigrand_ranges(self): for i in [40,80, 160, 200, 211, 250, 375, 512, 550]: - start = self.gen.randrange(2 ** i) - stop = self.gen.randrange(2 ** (i-2)) + start = self.gen.randrange(2 ** (i-2)) + stop = self.gen.randrange(2 ** i) if stop <= start: - return + continue self.assertTrue(start <= self.gen.randrange(start, stop) < stop) def test_rangelimits(self): @@ -403,10 +403,10 @@ def test_bigrand_ranges(self): for i in [40,80, 160, 200, 211, 250, 375, 512, 550]: - start = self.gen.randrange(2 ** i) - stop = self.gen.randrange(2 ** (i-2)) + start = self.gen.randrange(2 ** (i-2)) + stop = self.gen.randrange(2 ** i) if stop <= start: - return + continue self.assertTrue(start <= self.gen.randrange(start, stop) < stop) def test_rangelimits(self): diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -362,6 +362,7 @@ Jonathan Giddy Johannes Gijsbers Michael Gilfix +Julian Gindi Wim Glenn Christoph Gohlke Tim Golden diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -50,6 +50,9 @@ Tests ----- +- Issue #19588: Fixed tests in test_random that were silently skipped most + of the time. Patch by Julian Gindi. + - Issue #17883: Tweak test_tcl testLoadWithUNC to skip the test in the event of a permission error on Windows and to properly report other skip conditions. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with
by serhiy.storchaka Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/efd0e6d675ff changeset: 87595:efd0e6d675ff parent: 87592:08bcbc210a0f parent: 87594:a5c26e57f429 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Tue Nov 26 22:49:36 2013 +0200 summary: Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with virtual interface. Original patch by Kent Frazier. files: Lib/test/test_uuid.py | 21 +++++++++++++++++++++ Lib/uuid.py | 12 ++++++++++-- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -1,5 +1,7 @@ import unittest +from test import support import builtins +import io import os import uuid @@ -356,6 +358,25 @@ self.assertEqual(node1, node2) + def test_find_mac(self): + 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 +''' + def mock_popen(cmd): + return io.StringIO(data) + + with support.swap_attr(os, 'popen', mock_popen): + mac = uuid._find_mac( + command='ifconfig', + args='', + hw_identifiers=['hwaddr'], + get_index=lambda x: x + 1, + ) + self.assertEqual(mac, 0x1234567890ab) + @unittest.skipUnless(importable('ctypes'), 'requires ctypes') def test_uuid1(self): equal = self.assertEqual diff --git a/Lib/uuid.py b/Lib/uuid.py --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -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) + 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 diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -407,6 +407,7 @@ Andrew Francis Stefan Franke Martin Franklin +Kent Frazier Bruce Frederiksen Robin Friedrich Bradley Froehle diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -16,6 +16,9 @@ Library ------- +- Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with + virtual interface. Original patch by Kent Frazier. + - Issue #11489: JSON decoder now accepts lone surrogates. - Issue #19545: Avoid chained exceptions while passing stray % to -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with
by serhiy.storchaka Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/a5c26e57f429 changeset: 87594:a5c26e57f429 branch: 3.3 parent: 87591:8662734296a0 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Tue Nov 26 22:47:16 2013 +0200 summary: Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with virtual interface. Original patch by Kent Frazier. files: Lib/test/test_uuid.py | 21 +++++++++++++++++++++ Lib/uuid.py | 12 ++++++++++-- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -1,5 +1,7 @@ import unittest +from test import support import builtins +import io import os import uuid @@ -356,6 +358,25 @@ self.assertEqual(node1, node2) + def test_find_mac(self): + 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 +''' + def mock_popen(cmd): + return io.StringIO(data) + + with support.swap_attr(os, 'popen', mock_popen): + mac = uuid._find_mac( + command='ifconfig', + args='', + hw_identifiers=['hwaddr'], + get_index=lambda x: x + 1, + ) + self.assertEqual(mac, 0x1234567890ab) + @unittest.skipUnless(importable('ctypes'), 'requires ctypes') def test_uuid1(self): equal = self.assertEqual diff --git a/Lib/uuid.py b/Lib/uuid.py --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -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) + 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 IOError: continue return None diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -394,6 +394,7 @@ Andrew Francis Stefan Franke Martin Franklin +Kent Frazier Bruce Frederiksen Robin Friedrich Bradley Froehle diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -16,6 +16,9 @@ Library ------- +- Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with + virtual interface. Original patch by Kent Frazier. + - Issue #11489: JSON decoder now accepts lone surrogates. - Issue #19545: Avoid chained exceptions while passing stray % to -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with
by serhiy.storchaka Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/72951ffbdc76 changeset: 87593:72951ffbdc76 branch: 2.7 parent: 87587:c85305a54e6d user: Serhiy Storchaka <storchaka(a)gmail.com> date: Tue Nov 26 22:47:05 2013 +0200 summary: Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with virtual interface. Original patch by Kent Frazier. files: Lib/test/test_uuid.py | 20 ++++++++++++++++++++ Lib/uuid.py | 12 ++++++++++-- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -1,5 +1,6 @@ import unittest from test import test_support +import io import os import uuid @@ -346,6 +347,25 @@ self.assertEqual(node1, node2) + def test_find_mac(self): + 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 +''' + def mock_popen(cmd): + return io.BytesIO(data) + + with test_support.swap_attr(os, 'popen', mock_popen): + mac = uuid._find_mac( + command='ifconfig', + args='', + hw_identifiers=['hwaddr'], + get_index=lambda x: x + 1, + ) + self.assertEqual(mac, 0x1234567890ab) + @unittest.skipUnless(importable('ctypes'), 'requires ctypes') def test_uuid1(self): equal = self.assertEqual diff --git a/Lib/uuid.py b/Lib/uuid.py --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -307,8 +307,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) + 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 IOError: continue return None diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -324,6 +324,7 @@ John Fouhy Stefan Franke Martin Franklin +Kent Frazier Bruce Frederiksen Robin Friedrich Bradley Froehle diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,6 +15,9 @@ Library ------- +- Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with + virtual interface. Original patch by Kent Frazier. + - Issue #11489: JSON decoder now accepts lone surrogates. - Fix test.test_support.bind_port() to not cause an error when Python was -- Repository URL: http://hg.python.org/cpython

1 0