Merged revisions 77737 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77737 | benjamin.peterson | 2010-01-24 21:37:42 -0600 (Sun, 24 Jan 2010) | 9 lines

  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
  ........
................

diff --git a/Lib/platform.py b/Lib/platform.py
index 737198fcbfcd2074f4bc7405500b6a30ceaf3948..d5100a86c2eb69f4dda2bf44a2e6664048242eb3 100755 (executable)
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -245,6 +245,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:
@@ -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 9b752343aecc22bd40d9d3d4caf632c8d20811b1..af37185686256a827b2d488e6251fa0da838bdd6 100644 (file)
--- a/Lib/test/test_platform.py
+++ b/Lib/test/test_platform.py
@@ -191,6 +191,7 @@ class PlatformTest(unittest.TestCase):
             ('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 f32b46b6fe041c44c18c06c8560cd472660d148a..3421585a165afce815edeae08b397bfb48642b7c 100644 (file)
--- 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 74a64f0e1e07f2b8d4d1dae34ab110484e5afe44..befc61c323b0ac9a153ea94dda3031b8b9855e70 100644 (file)
--- 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.