diff options
| author | Julien Danjou <julien@danjou.info> | 2013-08-22 14:23:31 +0200 |
|---|---|---|
| committer | Julien Danjou <julien@danjou.info> | 2013-08-22 14:23:31 +0200 |
| commit | 127828a2f11f144cc2afe3499ac4a968f3826e00 (patch) | |
| tree | 64b5b8124cfb6eef0f3ef4b59d15dee026043a04 | |
| parent | bc3ed747f047a8bfadb48c6c60746c8bfa7b65bc (diff) | |
| download | oslo-serialization-127828a2f11f144cc2afe3499ac4a968f3826e00.tar.gz | |
jsonutils: make types py3 compatible
In Python 3, there's no long nor NoneType. Let's replace by equivalent
values.
Change-Id: Id1aa7af26b0f5d929337cc373c6a4f802bba2cec
| -rw-r--r-- | openstack/common/jsonutils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack/common/jsonutils.py b/openstack/common/jsonutils.py index bc62618..b64d69a 100644 --- a/openstack/common/jsonutils.py +++ b/openstack/common/jsonutils.py @@ -38,7 +38,6 @@ import functools import inspect import itertools import json -import types try: import xmlrpclib except ImportError: @@ -58,7 +57,8 @@ _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 = (six.string_types + six.integer_types + + (type(None), bool, float)) def to_primitive(value, convert_instances=False, convert_datetime=True, |