Py3: Replace `compare` with `key` function.

diff --git a/lsb_release.py b/lsb_release.py
index d4335c6cea6a652beee26535864844edcaf78a0c..b7d1689d6785fa5002448c43b57ad5ff7b351290 100644 (file)
--- a/lsb_release.py
+++ b/lsb_release.py
@@ -247,7 +247,7 @@ def guess_release_from_apt(origin='Debian', component='main',
 
     max_priority = releases[0][0]
     releases = [x for x in releases if x[0] == max_priority]
-    releases.sort(compare_release)
+    releases.sort(key=release_index)
 
     return releases[0][1]
 

diff --git a/test/test_lsb_release.py b/test/test_lsb_release.py
index 4966d5491c7ad70175bc82b93515ecc7e3243fcd..2673c5265efa5a2684c4ee1e5f940f4c5aec39d4 100644 (file)
--- a/test/test_lsb_release.py
+++ b/test/test_lsb_release.py
@@ -7,6 +7,7 @@ import random
 import string
 
 import os
+import sys
 
 def rnd_string(min_l,max_l):
        return ''.join( [random.choice(string.ascii_letters) for i in range(random.randint(min_l,max_l))])
@@ -109,10 +110,11 @@ class TestLSBRelease(unittest.TestCase):
                        suite_name = rnd_string(8,25)
                        suites.append(suite_name)
                        releases.append([rnd_string(1,12), {'suite': suite_name}])
-               suites_from_releases     = [x[1]['suite'] for x in sorted(releases,lr.compare_release)]
-               suites_from_releases_new = [x[1]['suite'] for x in sorted(releases,key=lr.release_index)]
                suites.sort()
-               self.assertEqual(suites,suites_from_releases)
+               if sys.version_info[0] == '2':
+                       suites_from_releases     = [x[1]['suite'] for x in sorted(releases,lr.compare_release)]
+                       self.assertEqual(suites,suites_from_releases)
+               suites_from_releases_new = [x[1]['suite'] for x in sorted(releases,key=lr.release_index)]
                self.assertEqual(suites,suites_from_releases_new)
 
                # Compare suites with known suite names
@@ -125,10 +127,11 @@ class TestLSBRelease(unittest.TestCase):
                        suite_name = lr.RELEASES_ORDER[suite_i]
                        suites.append(suite_name)
                        releases.append([rnd_string(1,12), {'suite': suite_name}])
-               suites_from_releases     = [x[1]['suite'] for x in sorted(releases,lr.compare_release)]
-               suites_from_releases_new = [x[1]['suite'] for x in sorted(releases,key=lr.release_index)]
                suites.sort(key=lambda suite: int(lr.RELEASES_ORDER.index(suite)),reverse=True)
-               self.assertEqual(suites,suites_from_releases)
+               if sys.version_info[0] == '2':
+                       suites_from_releases     = [x[1]['suite'] for x in sorted(releases,lr.compare_release)]
+                       self.assertEqual(suites,suites_from_releases)
+               suites_from_releases_new = [x[1]['suite'] for x in sorted(releases,key=lr.release_index)]
                self.assertEqual(suites,suites_from_releases_new)
 
        def test_compare_release(self):