diff --git a/Lib/platform.py b/Lib/platform.py index 737198fcbfc..d5100a86c2e 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -245,6 +245,12 @@ def _dist_try_harder(distname,version,id): def _parse_release_file(firstline): + # Default to empty 'version' and 'id' strings. Both defaults are used + # when 'firstline' is empty. 'id' defaults to empty when an id can not + # be deduced. + version = '' + id = '' + # Parse the first line m = _lsb_release_version.match(firstline) if m is not None: @@ -262,8 +268,6 @@ def _parse_release_file(firstline): version = l[0] if len(l) > 1: id = l[1] - else: - id = '' return '', version, id def linux_distribution(distname='', version='', id='', diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py index 9b752343aec..af371856862 100644 --- a/Lib/test/test_platform.py +++ b/Lib/test/test_platform.py @@ -191,6 +191,7 @@ def test_parse_release_file(self): ('Red Hat Enterprise Linux release 4 (Nahant)', ('Red Hat Enterprise Linux', '4', 'Nahant')), ('CentOS release 4', ('CentOS', '4', None)), ('Rocks release 4.2.1 (Cydonia)', ('Rocks', '4.2.1', 'Cydonia')), + ('', ('', '', '')), # If there's nothing there. ): self.assertEqual(platform._parse_release_file(input), output) diff --git a/Misc/ACKS b/Misc/ACKS index f32b46b6fe0..3421585a165 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -347,6 +347,7 @@ Jeremy Hylton Gerhard Häring Mihai Ibanescu Lars Immisch +Meador Inge Tony Ingraldi John Interrante Bob Ippolito diff --git a/Misc/NEWS b/Misc/NEWS index 74a64f0e1e0..befc61c323b 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -73,6 +73,9 @@ Core and Builtins Library ------- +- Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when + the release file is empty. + - Issue #7561: Fix crashes when using bytearray objects with the posix module.