Merge "Synced jsonutils from oslo-incubator"

Jenkins 9 years ago committed by Gerrit Code Review
commit b9c142e340

@ -1,2 +1,17 @@
# 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
# 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.
import six
six.add_move(six.MovedModule('mox', 'mox', 'mox3.mox'))

@ -35,18 +35,20 @@ import datetime
import functools
import inspect
import itertools
import json
import xmlrpclib
except ImportError:
# NOTE(jaypipes): xmlrpclib was renamed to xmlrpc.client in Python3
# however the function and object call signatures
# remained the same. This whole try/except block should
# be removed and replaced with a call to six.moves once
# six 1.4.2 is released. See
import xmlrpc.client as xmlrpclib
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
import simplejson as json
except ImportError:
import json
import json
import six
import six.moves.xmlrpc_client as xmlrpclib
from keystoneclient.openstack.common import gettextutils
from keystoneclient.openstack.common import importutils