[Python-checkins] r77736 - in python/branches/release26-maint: Lib/platform.py Lib/test/test_platform.py Misc/ACKS Misc/NEWS

[benjamin.peterson]

Author: benjamin.peterson
Date: Mon Jan 25 04:35:04 2010
New Revision: 77736

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


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/platform.py
   python/branches/release26-maint/Lib/test/test_platform.py
   python/branches/release26-maint/Misc/ACKS
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/platform.py
==============================================================================
--- python/branches/release26-maint/Lib/platform.py	(original)
+++ python/branches/release26-maint/Lib/platform.py	Mon Jan 25 04:35:04 2010
@@ -247,6 +247,12 @@
 
 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 @@
         version = l[0]
         if len(l) > 1:
             id = l[1]
-        else:
-            id = ''
     return '', version, id
 
 def _test_parse_release_file():

Modified: python/branches/release26-maint/Lib/test/test_platform.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_platform.py	(original)
+++ python/branches/release26-maint/Lib/test/test_platform.py	Mon Jan 25 04:35:04 2010
@@ -131,6 +131,24 @@
             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

Modified: python/branches/release26-maint/Misc/ACKS
==============================================================================
--- python/branches/release26-maint/Misc/ACKS	(original)
+++ python/branches/release26-maint/Misc/ACKS	Mon Jan 25 04:35:04 2010
@@ -336,6 +336,7 @@
 Gerhard Häring
 Mihai Ibanescu
 Lars Immisch
+Meador Inge
 Tony Ingraldi
 John Interrante
 Bob Ippolito

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Mon Jan 25 04:35:04 2010
@@ -53,6 +53,9 @@
 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