Merge "Python 3 compatibility: remove long"
This commit is contained in:
commit
2e7af54b42
|
@ -52,7 +52,7 @@ _nasty_type_tests = [inspect.ismodule, inspect.isclass, inspect.ismethod,
|
||||||
inspect.iscode, inspect.isbuiltin, inspect.isroutine,
|
inspect.iscode, inspect.isbuiltin, inspect.isroutine,
|
||||||
inspect.isabstract]
|
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,
|
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'>
|
# 26164 <type 'list'>
|
||||||
# 6491 <type 'float'>
|
# 6491 <type 'float'>
|
||||||
# 283 <type 'tuple'>
|
# 283 <type 'tuple'>
|
||||||
# 19 <type 'long'>
|
|
||||||
if isinstance(value, _simple_types):
|
if isinstance(value, _simple_types):
|
||||||
return value
|
return value
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue