xan/python-awips
1
0
Fork 0
mirror of https://github.com/Unidata/python-awips.git synced 2025-02-23 22:57:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix long type for py3 in RequestConstraint

Browse source
This commit is contained in:
Michael James 2018-10-14 19:48:09 -06:00
parent 6cb3567e3d
commit 3d7c20a637
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/RequestConstraint.py
View file

@ -136,8 +136,6 @@ class RequestConstraint(object):
Return value coerced to be the same type as otherValue. If this is
not possible, just return value unmodified.
'''
# cannot use type() because otherValue might be an instance of an
# old-style class (then it would just be of type "instance")
if not isinstance(value, otherValue.__class__):
try:
return otherValue.__class__(value)
@ -210,7 +208,7 @@ class RequestConstraint(object):
@staticmethod
def _stringify(value):
if six.PY2:
if type(value) in {str, int, long, bool, float, unicode}:
if isinstance(value, (str, int, long, bool, float, unicode)):
return str(value)
else:
# Collections are not allowed; they are handled separately.
@ -219,7 +217,7 @@ class RequestConstraint(object):
raise TypeError('Constraint values of type ' + repr(type(value)) +
'are not allowed')
else:
if isinstance(value, (str, int, long, float)):
if isinstance(value, (str, int, bool, float)):
return str(value)
else:
# Collections are not allowed; they are handled separately.