openstack/aodh
Code Issues Proposed changes

Merge "Synced jsonutils from oslo-incubator"

Browse Source
This commit is contained in:
Jenkins 2014-06-13 04:47:54 +00:00 committed by Gerrit Code Review
commit 199da1b22d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ceilometer/openstack/common/jsonutils.py
View File

@ -31,6 +31,7 @@ This module provides a few things:
'''
import codecs
import datetime
import functools
import inspect
@ -52,6 +53,7 @@ import six.moves.xmlrpc_client as xmlrpclib
from ceilometer.openstack.common import gettextutils
from ceilometer.openstack.common import importutils
from ceilometer.openstack.common import strutils
from ceilometer.openstack.common import timeutils
netaddr = importutils.try_import("netaddr")
@ -166,12 +168,12 @@ def dumps(value, default=to_primitive, **kwargs):
return json.dumps(value, default=default, **kwargs)
def loads(s):
return json.loads(s)
def loads(s, encoding='utf-8'):
return json.loads(strutils.safe_decode(s, encoding))
def load(s):
return json.load(s)
def load(fp, encoding='utf-8'):
return json.load(codecs.getreader(encoding)(fp))
try: