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
This commit is contained in:
parent
ecfcb5b935
commit
f4ee150026
3 changed files with 10 additions and 16 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue