From: Oleg Broytman <phd@phdru.name>
Date: Sat, 16 Sep 2023 19:40:15 +0000 (+0300)
Subject: Fix(Py3): Fix `cmp` compatibility
X-Git-Tag: 5.0.0~70
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=62ab6d5ee349ff88ed4995735711e1e3de904302;p=bookmarks_db.git

Fix(Py3): Fix `cmp` compatibility
---

diff --git a/sort_db.py b/sort_db.py
index 4418973..fce1ac4 100755
--- a/sort_db.py
+++ b/sort_db.py
@@ -19,23 +19,16 @@ __license__ = "GNU GPL"
 import sys
 
 
-class SortBy(object):
+class SortKey(object):
     def __init__(self, sort_by):
         self.sort_by = sort_by
 
-    def __call__(self, o1, o2):
+    def __call__(self, o1):
         try:
-            attr1 = int(getattr(o1, self.sort_by))
+            return int(getattr(o1, self.sort_by))
         except (AttributeError, TypeError, ValueError):
             return 1
 
-        try:
-            attr2 = int(getattr(o2, self.sort_by))
-        except (AttributeError, TypeError, ValueError):
-            return -1
-
-        return cmp(attr1, attr2)
-
 
 def walk_linear(linear, walker):
     for object in linear:
@@ -91,8 +84,8 @@ def run():
     linear = root_folder.linear
     del linear[0]  # exclude root folder from sorting
 
-    by = SortBy(sort_by)
-    linear.sort(by)
+    sort_key = SortKey(sort_by)
+    linear.sort(key=sort_key)
 
     from writers import writer
     output_filename = "%s-sorted_by-%s" % (writer.filename, sort_by)