From f3ae1fdb50df53f6b2c09cfed32737e5d325b92f Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Mar 19 2018 13:32:34 +0000 Subject: drop encode_int helper We're already using i8 encoding mechanism, so this function is no more needed. Fixes: https://pagure.io/koji/issue/750 --- diff --git a/hub/kojihub.py b/hub/kojihub.py index 4e0e558..55f4adb 100644 --- a/hub/kojihub.py +++ b/hub/kojihub.py @@ -3610,8 +3610,6 @@ def get_next_release(build_info): def _fix_rpm_row(row): - if 'size' in row: - row['size'] = koji.encode_int(row['size']) if 'extra' in row: row['extra'] = parse_json(row['extra'], desc='rpm extra') return row @@ -8899,7 +8897,7 @@ class RootExports(object): st = os.fstat(fd) if not stat.S_ISREG(st.st_mode): raise koji.GenericError("Not a regular file: %s" % fn) - data['size'] = koji.encode_int(st.st_size) + data['size'] = st.st_size data['mtime'] = st.st_mtime if verify: sum_cls = get_verify_class(verify) @@ -8915,7 +8913,7 @@ class RootExports(object): length += len(chunk) chksum.update(chunk) chunk = os.read(fd, 8192) - data['sumlength'] = koji.encode_int(length) + data['sumlength'] = length data['hexdigest'] = chksum.hexdigest() return data finally: @@ -12703,9 +12701,9 @@ def handle_upload(environ): # this will also remove our lock os.close(fd) ret = { - 'size': koji.encode_int(size), + 'size': size, 'fileverify': verify, - 'offset': koji.encode_int(offset), + 'offset': offset, } if verify: # unsigned 32bit - could be too big for xmlrpc diff --git a/koji/__init__.py b/koji/__init__.py index 24347bd..cd863cd 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -453,16 +453,6 @@ def decode_args2(args, names, strict=True): ret.update(opts) return ret -## BEGIN kojikamid dup - -def encode_int(n): - """If n is too large for a 32bit signed, convert it to a string""" - if n <= 2147483647: - return n - #else - return str(n) -## END kojikamid dup - def decode_int(n): """If n is not an integer, attempt to convert it""" if isinstance(n, six.integer_types): diff --git a/vm/kojikamid.py b/vm/kojikamid.py index 1d40e68..c4e8c1b 100755 --- a/vm/kojikamid.py +++ b/vm/kojikamid.py @@ -57,6 +57,12 @@ koji = fakemodule() koji.GenericError = GenericError koji.BuildError = BuildError +def encode_int(n): + """If n is too large for a 32bit signed, convert it to a string""" + if n <= 2147483647: + return n + #else + return str(n) class WindowsBuild(object):