summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-06-14 13:27:28 -0400
committerAlex Meade <alex.meade@rackspace.com>2011-06-14 13:27:28 -0400
commitcf66a99314d6420725e32daf6a08404c98239107 (patch)
treea660a57f3090e94dd2ee620bd5c2dce02dadc495
parente9f6e47a92090a9a7867c2a117ae6cf58db394ac (diff)
downloadnova-cf66a99314d6420725e32daf6a08404c98239107.tar.gz
nova-cf66a99314d6420725e32daf6a08404c98239107.tar.xz
nova-cf66a99314d6420725e32daf6a08404c98239107.zip
mp fixes
-rw-r--r--nova/api/openstack/wsgi.py4
-rw-r--r--nova/exception.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index 0b749e115..43b51b64a 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -77,7 +77,7 @@ class JSONDeserializer(TextDeserializer):
return utils.loads(datastring)
except ValueError:
raise exception.MalformedRequestBody(
- "malformed JSON in request body")
+ reason=_("malformed JSON in request body"))
class XMLDeserializer(TextDeserializer):
@@ -98,7 +98,7 @@ class XMLDeserializer(TextDeserializer):
return {node.nodeName: self._from_xml_node(node, plurals)}
except ExpatError:
raise exception.MalformedRequestBody(
- "malformed XML in request Body")
+ reason=_("malformed XML in request body"))
def _from_xml_node(self, node, listnames):
"""Convert a minidom node to a simple Python type.
diff --git a/nova/exception.py b/nova/exception.py
index ffd88fbe7..f3a452228 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -588,4 +588,4 @@ class MigrationError(NovaException):
class MalformedRequestBody(NovaException):
- message = _("Malformed message body") + ": %(reason)s"
+ message = _("Malformed message body: %(reason)s")