diff options
| author | Alex Meade <alex.meade@rackspace.com> | 2011-06-14 21:21:41 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-06-14 21:21:41 +0000 |
| commit | 046656b511a8ea881dcb8df6de6c51caf35486bd (patch) | |
| tree | 71c19ae08d0dd7e1c426c44999a3aecdc8440ea6 /nova/api | |
| parent | 2899a388ea02d1bbb1fe0ed03ef1686bae907186 (diff) | |
| parent | 6d960ff50d4cf8e6b2dc59aff0e8dea17498a9f0 (diff) | |
| download | nova-046656b511a8ea881dcb8df6de6c51caf35486bd.tar.gz nova-046656b511a8ea881dcb8df6de6c51caf35486bd.tar.xz nova-046656b511a8ea881dcb8df6de6c51caf35486bd.zip | |
Changed requests with malformed bodies to return a HTTP 400 Bad Request instead of a HTTP 500 error.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/wsgi.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py index 0279f784a..3f8acf339 100644 --- a/nova/api/openstack/wsgi.py +++ b/nova/api/openstack/wsgi.py @@ -2,10 +2,10 @@ import json import webob from xml.dom import minidom -from xml.parsers.expat import ExpatError +from xml.parsers import expat -from nova import exception import faults +from nova import exception from nova import log as logging from nova import utils from nova import wsgi @@ -96,7 +96,7 @@ class XMLDeserializer(TextDeserializer): try: node = minidom.parseString(datastring).childNodes[0] return {node.nodeName: self._from_xml_node(node, plurals)} - except ExpatError: + except expat.ExpatError: raise exception.MalformedRequestBody( reason=_("malformed XML in request body")) |