From f09486f6b3c0476aededa947a8670b79387b5044 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 20 Oct 2014 10:23:13 +0200 Subject: [PATCH] Use oslo.serialization jsonutils from oslo-incubator is deprecated, replace it with oslo.serialization. Change-Id: I34af54bcb55eb0e1be3b74ea266b5da8bc5dc47d Closes-Bug: #1383165 --- manilaclient/client.py | 2 +- manilaclient/openstack/common/jsonutils.py | 190 --------------------- manilaclient/tests/unit/v1/test_shell.py | 2 +- openstack-common.conf | 1 - requirements.txt | 1 + 5 files changed, 3 insertions(+), 193 deletions(-) delete mode 100644 manilaclient/openstack/common/jsonutils.py diff --git a/manilaclient/client.py b/manilaclient/client.py index f713a131c..1ba7d2e81 100644 --- a/manilaclient/client.py +++ b/manilaclient/client.py @@ -38,11 +38,11 @@ if not hasattr(urlparse, 'parse_qsl'): import cgi urlparse.parse_qsl = cgi.parse_qsl +from oslo.serialization import jsonutils import requests from manilaclient import exceptions from manilaclient.openstack.common import importutils -from manilaclient.openstack.common import jsonutils from manilaclient import service_catalog diff --git a/manilaclient/openstack/common/jsonutils.py b/manilaclient/openstack/common/jsonutils.py deleted file mode 100644 index 1887fd635..000000000 --- a/manilaclient/openstack/common/jsonutils.py +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# Copyright 2011 Justin Santa Barbara -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -''' -JSON related utilities. - -This module provides a few things: - - 1) A handy function for getting an object down to something that can be - JSON serialized. See to_primitive(). - - 2) Wrappers around loads() and dumps(). The dumps() wrapper will - automatically use to_primitive() for you if needed. - - 3) This sets up anyjson to use the loads() and dumps() wrappers if anyjson - is available. -''' - - -import codecs -import datetime -import functools -import inspect -import itertools -import sys - -if sys.version_info < (2, 7): - # On Python <= 2.6, json module is not C boosted, so try to use - # simplejson module if available - try: - import simplejson as json - except ImportError: - import json -else: - import json - -import six -import six.moves.xmlrpc_client as xmlrpclib - -from manilaclient.openstack.common import gettextutils -from manilaclient.openstack.common import importutils -from manilaclient.openstack.common import strutils -from manilaclient.openstack.common import timeutils - -netaddr = importutils.try_import("netaddr") - -_nasty_type_tests = [inspect.ismodule, inspect.isclass, inspect.ismethod, - inspect.isfunction, inspect.isgeneratorfunction, - inspect.isgenerator, inspect.istraceback, inspect.isframe, - inspect.iscode, inspect.isbuiltin, inspect.isroutine, - inspect.isabstract] - -_simple_types = (six.string_types + six.integer_types - + (type(None), bool, float)) - - -def to_primitive(value, convert_instances=False, convert_datetime=True, - level=0, max_depth=3): - """Convert a complex object into primitives. - - Handy for JSON serialization. We can optionally handle instances, - but since this is a recursive function, we could have cyclical - data structures. - - To handle cyclical data structures we could track the actual objects - visited in a set, but not all objects are hashable. Instead we just - track the depth of the object inspections and don't go too deep. - - Therefore, convert_instances=True is lossy ... be aware. - - """ - # handle obvious types first - order of basic types determined by running - # full tests on nova project, resulting in the following counts: - # 572754 - # 460353 - # 379632 - # 274610 - # 199918 - # 114200 - # 51817 - # 26164 - # 6491 - # 283 - # 19 - if isinstance(value, _simple_types): - return value - - if isinstance(value, datetime.datetime): - if convert_datetime: - return timeutils.strtime(value) - else: - return value - - # value of itertools.count doesn't get caught by nasty_type_tests - # and results in infinite loop when list(value) is called. - if type(value) == itertools.count: - return six.text_type(value) - - # FIXME(vish): Workaround for LP bug 852095. Without this workaround, - # tests that raise an exception in a mocked method that - # has a @wrap_exception with a notifier will fail. If - # we up the dependency to 0.5.4 (when it is released) we - # can remove this workaround. - if getattr(value, '__module__', None) == 'mox': - return 'mock' - - if level > max_depth: - return '?' - - # The try block may not be necessary after the class check above, - # but just in case ... - try: - recursive = functools.partial(to_primitive, - convert_instances=convert_instances, - convert_datetime=convert_datetime, - level=level, - max_depth=max_depth) - if isinstance(value, dict): - return dict((k, recursive(v)) for k, v in six.iteritems(value)) - elif isinstance(value, (list, tuple)): - return [recursive(lv) for lv in value] - - # It's not clear why xmlrpclib created their own DateTime type, but - # for our purposes, make it a datetime type which is explicitly - # handled - if isinstance(value, xmlrpclib.DateTime): - value = datetime.datetime(*tuple(value.timetuple())[:6]) - - if convert_datetime and isinstance(value, datetime.datetime): - return timeutils.strtime(value) - elif isinstance(value, gettextutils.Message): - return value.data - elif hasattr(value, 'iteritems'): - return recursive(dict(value.iteritems()), level=level + 1) - elif hasattr(value, '__iter__'): - return recursive(list(value)) - elif convert_instances and hasattr(value, '__dict__'): - # Likely an instance of something. Watch for cycles. - # Ignore class member vars. - return recursive(value.__dict__, level=level + 1) - elif netaddr and isinstance(value, netaddr.IPAddress): - return six.text_type(value) - else: - if any(test(value) for test in _nasty_type_tests): - return six.text_type(value) - return value - except TypeError: - # Class objects are tricky since they may define something like - # __iter__ defined but it isn't callable as list(). - return six.text_type(value) - - -def dumps(value, default=to_primitive, **kwargs): - return json.dumps(value, default=default, **kwargs) - - -def dump(obj, fp, *args, **kwargs): - return json.dump(obj, fp, *args, **kwargs) - - -def loads(s, encoding='utf-8', **kwargs): - return json.loads(strutils.safe_decode(s, encoding), **kwargs) - - -def load(fp, encoding='utf-8', **kwargs): - return json.load(codecs.getreader(encoding)(fp), **kwargs) - - -try: - import anyjson -except ImportError: - pass -else: - anyjson._modules.append((__name__, 'dumps', TypeError, - 'loads', ValueError, 'load')) - anyjson.force_implementation(__name__) diff --git a/manilaclient/tests/unit/v1/test_shell.py b/manilaclient/tests/unit/v1/test_shell.py index 73cdad9ea..52d248e07 100644 --- a/manilaclient/tests/unit/v1/test_shell.py +++ b/manilaclient/tests/unit/v1/test_shell.py @@ -16,6 +16,7 @@ import fixtures import mock +from oslo.serialization import jsonutils import requests import six @@ -23,7 +24,6 @@ from manilaclient import client from manilaclient.common import constants from manilaclient import exceptions from manilaclient.openstack.common import cliutils -from manilaclient.openstack.common import jsonutils from manilaclient import shell from manilaclient.tests.unit import utils as test_utils from manilaclient.tests.unit.v1 import fakes diff --git a/openstack-common.conf b/openstack-common.conf index f5380ef50..c08b566ec 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -5,7 +5,6 @@ module=apiclient module=cliutils module=gettextutils module=importutils -module=jsonutils module=strutils module=timeutils module=uuidutils diff --git a/requirements.txt b/requirements.txt index 0840aa374..c03e260f7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,7 @@ pbr>=0.6,!=0.7,<1.0 argparse iso8601>=0.1.9 keyring>=2.1,!=3.3 +oslo.serialization>=1.0.0 # Apache-2.0 PrettyTable>=0.7,<0.8 pycrypto>=2.6 requests>=2.2.0,!=2.4.0