X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Fsrpm_builder.py;h=d76146697ff9dc0f300160ac3571d70274d964f0;hb=88fe74f7b25183045fa91c6cd9a0b3e7b43638ca;hp=6b8ea545e90acd714dae3614b3ecd24d53d51b45;hpb=efb29ebd19be1db746873c582469d897b76f50ef;p=tld-builder.git diff --git a/TLD_Builder/srpm_builder.py b/TLD_Builder/srpm_builder.py index 6b8ea54..d761466 100644 --- a/TLD_Builder/srpm_builder.py +++ b/TLD_Builder/srpm_builder.py @@ -5,10 +5,6 @@ import string import time import os import sys -if sys.version_info[0] == 2: - import StringIO -else: - from io import StringIO import re import shutil import atexit @@ -37,12 +33,12 @@ def pick_request(q): def mycmp(r1, r2): if r1.kind != 'group' or r2.kind != 'group': raise Exception("non-group requests") - pri_diff = cmp(r1.priority, r2.priority) + pri_diff = util.cmp(r1.priority, r2.priority) if pri_diff == 0: - return cmp(r1.time, r2.time) + return util.cmp(r1.time, r2.time) else: return pri_diff - q.requests.sort(key=mycmp) + q.requests.sort(key=util.cmp_to_key(mycmp)) ret = q.requests[0] q.requests = q.requests[1:] return ret