starlingx
/
config
Code Issues Proposed changes

Merge "Python 3 compatibility: remove long"

This commit is contained in:
Zuul 2018-10-25 13:26:07 +00:00 committed by Gerrit Code Review
parent 3a29c1170d 594c5e5617
commit 2e7af54b42
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysinv/sysinv/sysinv/sysinv/openstack/common/jsonutils.py
View File

@ -52,7 +52,7 @@ _nasty_type_tests = [inspect.ismodule, inspect.isclass, inspect.ismethod,
inspect.iscode, inspect.isbuiltin, inspect.isroutine,
inspect.isabstract]
_simple_types = (types.NoneType, int, basestring, bool, float, long)
_simple_types = (types.NoneType, six.integer_types, basestring, bool, float)
def to_primitive(value, convert_instances=False, convert_datetime=True,
@ -82,7 +82,6 @@ def to_primitive(value, convert_instances=False, convert_datetime=True,
# 26164 <type 'list'>
# 6491 <type 'float'>
# 283 <type 'tuple'>
# 19 <type 'long'>
if isinstance(value, _simple_types):
return value