diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-08 19:20:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-08 19:20:12 +0000 |
| commit | 5df2184cd0424e7034464ff387a86266b93e9bf5 (patch) | |
| tree | 59c52bc1c377463cdca4e004b3e2853c876c743f /openstack/common | |
| parent | 1230c7a62760a13d00b58c7fc9c7fa50ab231c61 (diff) | |
| parent | e3ddc41f1b02644d7fae4482c4beade7f27e58de (diff) | |
| download | oslo-5df2184cd0424e7034464ff387a86266b93e9bf5.tar.gz oslo-5df2184cd0424e7034464ff387a86266b93e9bf5.tar.xz oslo-5df2184cd0424e7034464ff387a86266b93e9bf5.zip | |
Merge "JSONDictSerializer encode objects to unicode"
Diffstat (limited to 'openstack/common')
| -rw-r--r-- | openstack/common/wsgi.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack/common/wsgi.py b/openstack/common/wsgi.py index f52fca0..1d6d9df 100644 --- a/openstack/common/wsgi.py +++ b/openstack/common/wsgi.py @@ -387,7 +387,7 @@ class JSONDictSerializer(DictSerializer): if isinstance(obj, datetime.datetime): _dtime = obj - datetime.timedelta(microseconds=obj.microsecond) return _dtime.isoformat() - return obj + return unicode(obj) return jsonutils.dumps(data, default=sanitizer) |