diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-01-25 03:35:04 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-01-25 03:35:04 +0000 |
| commit | 00b9051a7e28f13fccce409fa63f5cbdb49f280d (patch) | |
| tree | 4d8f265f9b49bf114083263c07a32e9084387f77 /Lib/platform.py | |
| parent | 7671709ec65979ea6e3b728b6dfecf6eec4d34a7 (diff) | |
| download | cpython-git-00b9051a7e28f13fccce409fa63f5cbdb49f280d.tar.gz | |
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
........
Diffstat (limited to 'Lib/platform.py')
| -rwxr-xr-x | Lib/platform.py | 8 |
1 files changed, 6 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(): |