From 088d500e0e1b33a8f50e6ec85a73118619bcd5d8 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Dec 04 2018 04:55:45 +0000
Subject: PR#852: drop encode_int helper


Merges #852
https://pagure.io/koji/pull-request/852

Fixes: #750
https://pagure.io/koji/issue/750
Drop use of encode_int on hub

---

diff --git a/hub/kojihub.py b/hub/kojihub.py
index ce18787..e4c7a53 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -3715,8 +3715,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
@@ -9148,7 +9146,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)
@@ -9164,7 +9162,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:
@@ -13002,9 +13000,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 f529eb7..aba10ec 100644
--- a/koji/__init__.py
+++ b/koji/__init__.py
@@ -464,16 +464,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 94619a0..21403f6 100755
--- a/vm/kojikamid.py
+++ b/vm/kojikamid.py
@@ -59,6 +59,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):