summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorZhongyue Luo <lzyeval@gmail.com>2012-06-07 14:08:38 +0800
committerZhongyue Luo <lzyeval@gmail.com>2012-06-08 23:01:26 +0800
commit5fc561c95fd391339030809d9958a3ef45505742 (patch)
treed3b400e7da82fec91ab32139092c746439a966f6 /openstack
parent2d9463709588d88172e125a97200ac813ee79eb4 (diff)
downloadoslo-5fc561c95fd391339030809d9958a3ef45505742.tar.gz
oslo-5fc561c95fd391339030809d9958a3ef45505742.tar.xz
oslo-5fc561c95fd391339030809d9958a3ef45505742.zip
Make jsonutils.dumps more general
Fixes bug #1009848 Fixed jsonutils.dumps to receive other parameters Change-Id: I34836ae89359bccb689a36a7b486e85bb41d70e4
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/jsonutils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack/common/jsonutils.py b/openstack/common/jsonutils.py
index 12a8cf2..7522669 100644
--- a/openstack/common/jsonutils.py
+++ b/openstack/common/jsonutils.py
@@ -122,8 +122,8 @@ def to_primitive(value, convert_instances=False, level=0):
return unicode(value)
-def dumps(value):
- return json.dumps(value, default=to_primitive)
+def dumps(value, default=to_primitive, **kwargs):
+ return json.dumps(value, default=default, **kwargs)
def loads(s):