Some more python3 quirks

diff --git a/client/rebuild-kernel-packages.py b/client/rebuild-kernel-packages.py
index 15ae5fc11d5983b8598c2b92eb389f885e52641a..318dffa8ecc3f8bc05aaecd4b0beaed7c6c4bb54 100755 (executable)
--- a/client/rebuild-kernel-packages.py
+++ b/client/rebuild-kernel-packages.py
@@ -4,6 +4,7 @@ from __future__ import print_function
 
 import argparse
 import collections
+import functools
 import os
 import rpm
 import shlex
@@ -53,7 +54,7 @@ def clean_pkgname(package):
     return [name, spec, branch]
 
 def run_command(command, verbose=False, quiet=True):
-    gitproc = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, bufsize=-1)
+    gitproc = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, bufsize=-1, text=True)
     gitproc.wait()
     out = gitproc.stdout.read().strip("\n'")
     if verbose:
@@ -109,6 +110,8 @@ def fetch_package(name, spec, branch, verbose=False):
 def csv_list(string):
     return string.split(',')
 
+# TDOD: convert this to key function
+# https://docs.python.org/3/library/stdtypes.html#list.sort
 def kernel_cmp(x, y):
     x = x.split('.')
     y = y.split('.')
@@ -186,14 +189,16 @@ def main():
                     'dist': args.dist,
                     'source_packages': ' '.join(source_packages)})
         run_command(shlex.split(command), verbose=args.verbose, quiet=False)
-        raw_input('\nPress Enter after src builder updates kernel packages...')
+        input('\nPress Enter after src builder updates kernel packages...')
 
     print('\nCurrent kernels versions:')
     all_kernels = set()
     for kernel_list in packages.values():
         all_kernels.update(kernel_list)
     all_kernels = list(all_kernels)
-    all_kernels.sort(cmp=kernel_cmp, reverse=True)
+    # TDOD: convert this to key function
+    # https://docs.python.org/3/library/stdtypes.html#list.sort
+    all_kernels.sort(key=functools.cmp_to_key(kernel_cmp), reverse=True)
     for kernel in all_kernels:
         branch = 'master'
         if kernel != 'head':