summaryrefslogtreecommitdiffstats
path: root/nova/wsgi.py
diff options
context:
space:
mode:
authorYuriy Taraday <yorik.sar@gmail.com>2011-05-05 07:04:34 +0400
committerYuriy Taraday <yorik.sar@gmail.com>2011-05-05 07:04:34 +0400
commitda286df51e00a9ee8a0450ee8afbce27712151a7 (patch)
treea7ea4ad57bd6f358b3927e6c6b4d3e8a29f2cddf /nova/wsgi.py
parent36aa631dfdea4d2041df3a60d1a294f6a80807b7 (diff)
parent114a55d0243f79db7ea1ef29830a9428dbf1aa33 (diff)
Merged with current trunk.
Diffstat (limited to 'nova/wsgi.py')
-rw-r--r--nova/wsgi.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/wsgi.py b/nova/wsgi.py
index f3f82b36a..e60a8820d 100644
--- a/nova/wsgi.py
+++ b/nova/wsgi.py
@@ -428,7 +428,7 @@ class Serializer(object):
try:
return handlers[content_type]
except Exception:
- raise exception.InvalidContentType()
+ raise exception.InvalidContentType(content_type=content_type)
def serialize(self, data, content_type):
"""Serialize a dictionary into the specified content type."""
@@ -451,8 +451,7 @@ class Serializer(object):
try:
return handlers[content_type]
except Exception:
- raise exception.InvalidContentType(_('Invalid content type %s'
- % content_type))
+ raise exception.InvalidContentType(content_type=content_type)
def _from_json(self, datastring):
return utils.loads(datastring)