particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix unicode type checks

Browse source
This commit is contained in:
Tomas Kopecek 2018-05-16 10:41:52 +02:00 • committed by Mike McLean
parent b37236d7ae
commit 56095e8018
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hub/kojihub.py
View file

@ -2878,7 +2878,7 @@ def lookup_name(table, info, strict=False, create=False):
q = """SELECT id,name FROM %s WHERE id=%%(info)d""" % table
elif isinstance(info, str):
q = """SELECT id,name FROM %s WHERE name=%%(info)s""" % table
elif isinstance(info, unicode):
elif six.PY2 and isinstance(info, unicode):
info = koji.fixEncoding(info)
q = """SELECT id,name FROM %s WHERE name=%%(info)s""" % table
else:
@ -5413,7 +5413,7 @@ class CG_Importer(object):
if metadata is None:
#default to looking for uploaded file
metadata = 'metadata.json'
if not isinstance(metadata, (str, unicode)):
if not isinstance(metadata, six.string_types):
raise koji.GenericError("Invalid metadata value: %r" % metadata)
if metadata.endswith('.json'):
# handle uploaded metadata
@ -9553,7 +9553,7 @@ class RootExports(object):
if before:
if isinstance(before, datetime.datetime):
before = calendar.timegm(before.utctimetuple())
elif isinstance(before, (str, unicode)):
elif isinstance(before, six.string_types):
before = koji.util.parseTime(before)
elif isinstance(before, six.integer_types):
pass
@ -9563,7 +9563,7 @@ class RootExports(object):
if after:
if isinstance(after, datetime.datetime):
after = calendar.timegm(after.utctimetuple())
elif isinstance(after, (str, unicode)):
elif isinstance(after, six.string_types):
after = koji.util.parseTime(after)
elif isinstance(after, six.integer_types):
pass