Merge "Synced jsonutils from oslo-incubator"

This commit is contained in:
Jenkins 2014-05-01 06:54:56 +00:00 committed by Gerrit Code Review
commit 171e1c5e99

View File

@ -35,7 +35,17 @@ import datetime
import functools
import inspect
import itertools
import json
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