diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-07 12:50:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-07 12:50:02 +0000 |
| commit | 6a4800d8cc36812835dca796895bafec940b2ce5 (patch) | |
| tree | cb8eedc9470e2a68d86a4863ddf98d200edb093d /openstack/common/wsgi.py | |
| parent | f9d502228752bcb909e58cafacd1cd948d9a8206 (diff) | |
| parent | fde1e156a38633ce9018569145390bce2047fea8 (diff) | |
| download | oslo-6a4800d8cc36812835dca796895bafec940b2ce5.tar.gz oslo-6a4800d8cc36812835dca796895bafec940b2ce5.tar.xz oslo-6a4800d8cc36812835dca796895bafec940b2ce5.zip | |
Merge "Convert unicode for python3 portability"
Diffstat (limited to 'openstack/common/wsgi.py')
| -rw-r--r-- | openstack/common/wsgi.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openstack/common/wsgi.py b/openstack/common/wsgi.py index 064c09c..9e92ffe 100644 --- a/openstack/common/wsgi.py +++ b/openstack/common/wsgi.py @@ -32,6 +32,7 @@ import eventlet.wsgi from oslo.config import cfg import routes import routes.middleware +import six import webob.dec import webob.exc from xml.dom import minidom @@ -453,7 +454,7 @@ class JSONDictSerializer(DictSerializer): if isinstance(obj, datetime.datetime): _dtime = obj - datetime.timedelta(microseconds=obj.microsecond) return _dtime.isoformat() - return unicode(obj) + return six.text_type(obj) return jsonutils.dumps(data, default=sanitizer) |