Convert new code since 2020 with 2to3

@Zaryob's valuable contribution is dated 2020. Since then, we've been modifying the codebase further. Another pass of 2to3 is needed.
getsolus · Aug 23, 2023 · b72c672 · b72c672
1 parent 586c750
commit b72c672
Show file tree

Hide file tree

Showing 28 changed files with 73 additions and 2,094 deletions.
diff --git a/pisi/api.py b/pisi/api.py
@@ -912,7 +912,7 @@ def getRemoveOrder(cacheDir, pkgList):
 
         # sort dictionary by value from PEP-265
         from operator import itemgetter
-        return sorted(iter(sizes.items()), key=itemgetter(1), reverse=False)
+        return sorted(iter(list(sizes.items())), key=itemgetter(1), reverse=False)
 
     def removeOrderByLimit(cacheDir, order, limit):
         totalSize = 0

diff --git a/pisi/archive.py b/pisi/archive.py
@@ -352,7 +352,7 @@ def unpack_dir(self, target_dir, callback=None):
                                     old_path = "/" + old_path
                                 if not new_path.startswith("/"):
                                     new_path = "/" + new_path
-                                print("Moving:", old_path, " -> ", new_path)
+                                print(("Moving:", old_path, " -> ", new_path))
                                 os.system("mv -f %s %s" % (old_path, new_path))
                             else:
                                 raise

diff --git a/pisi/cli/__init__.py.orig b/pisi/cli/__init__.py.orig