From 00b9051a7e28f13fccce409fa63f5cbdb49f280d Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 25 Jan 2010 03:35:04 +0000 Subject: [PATCH] Merged revisions 77735 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77735 | benjamin.peterson | 2010-01-24 21:31:13 -0600 (Sun, 24 Jan 2010) | 1 line fix an UnboundLocalError when the release file is empty #7773 ........ --- Lib/platform.py | 8 ++++++-- Lib/test/test_platform.py | 18 ++++++++++++++++++ Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py index 90ad93de2b..1852f30d0e 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -247,6 +247,12 @@ _supported_dists = ( 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: @@ -264,8 +270,6 @@ def _parse_release_file(firstline): version = l[0] if len(l) > 1: id = l[1] - else: - id = '' return '', version, id def _test_parse_release_file(): diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py index 9056d47f14..c3fd32322d 100644 --- a/Lib/test/test_platform.py +++ b/Lib/test/test_platform.py @@ -131,6 +131,24 @@ class PlatformTest(unittest.TestCase): executable = executable + '.exe' res = platform.libc_ver(sys.executable) + def test_parse_release_file(self): + + for input, output in ( + # Examples of release file contents: + ('SuSE Linux 9.3 (x86-64)', ('SuSE Linux ', '9.3', 'x86-64')), + ('SUSE LINUX 10.1 (X86-64)', ('SUSE LINUX ', '10.1', 'X86-64')), + ('SUSE LINUX 10.1 (i586)', ('SUSE LINUX ', '10.1', 'i586')), + ('Fedora Core release 5 (Bordeaux)', ('Fedora Core', '5', 'Bordeaux')), + ('Red Hat Linux release 8.0 (Psyche)', ('Red Hat Linux', '8.0', 'Psyche')), + ('Red Hat Linux release 9 (Shrike)', ('Red Hat Linux', '9', 'Shrike')), + ('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) + + def test_main(): test_support.run_unittest( PlatformTest diff --git a/Misc/ACKS b/Misc/ACKS index f1470ba807..9239daa2be 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -336,6 +336,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 b1a5ff54f0..14e2be93b4 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -53,6 +53,9 @@ Core and Builtins Library ------- +- Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when + the release file is empty. + - Issue #7748: Since unicode values are supported for some metadata options in Distutils, the DistributionMetadata get_* methods will now return an utf-8 encoded string for them. This ensure that the upload and register commands -- 2.50.0