summaryrefslogtreecommitdiffstats
path: root/nova/wsgi.py
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2011-03-14 22:29:30 -0700
committerJustin Santa Barbara <justin@fathomdb.com>2011-03-14 22:29:30 -0700
commit855da579147709b8070811751b3b3f684f9f78d6 (patch)
treed2039e0d03d6182c9eb9114ba4d777a82c361805 /nova/wsgi.py
parent2b20306fcaddcb6b9bc57fb55b17230d709cd1ce (diff)
parent5da32f8b917d461388d0186af52946a3f7d2c665 (diff)
downloadnova-855da579147709b8070811751b3b3f684f9f78d6.tar.gz
nova-855da579147709b8070811751b3b3f684f9f78d6.tar.xz
nova-855da579147709b8070811751b3b3f684f9f78d6.zip
Merged with trunk. Had to hold bazaar's hand as it got lost again.
Diffstat (limited to 'nova/wsgi.py')
-rw-r--r--nova/wsgi.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/wsgi.py b/nova/wsgi.py
index 2d18da8fb..ba0819466 100644
--- a/nova/wsgi.py
+++ b/nova/wsgi.py
@@ -436,7 +436,8 @@ class Serializer(object):
try:
return handlers[content_type]
except Exception:
- raise exception.InvalidContentType()
+ raise exception.InvalidContentType(_("Invalid content type %s"
+ % content_type))
def _from_json(self, datastring):
return utils.loads(datastring)