summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-06-14 15:51:22 -0400
committerAlex Meade <alex.meade@rackspace.com>2011-06-14 15:51:22 -0400
commit6d960ff50d4cf8e6b2dc59aff0e8dea17498a9f0 (patch)
tree45a86b34dfb2518fbc211c9abbb282fcc22d2f5e /nova/api
parentcf66a99314d6420725e32daf6a08404c98239107 (diff)
downloadnova-6d960ff50d4cf8e6b2dc59aff0e8dea17498a9f0.tar.gz
nova-6d960ff50d4cf8e6b2dc59aff0e8dea17498a9f0.tar.xz
nova-6d960ff50d4cf8e6b2dc59aff0e8dea17498a9f0.zip
fixed HACKING
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/wsgi.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index 43b51b64a..27d19db53 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"))