summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorMichael Gundlach <michael.gundlach@rackspace.com>2010-08-31 10:55:53 -0400
committerMichael Gundlach <michael.gundlach@rackspace.com>2010-08-31 10:55:53 -0400
commitcb55d65827170dd9d54dbd22f32e5c2171f8e1b1 (patch)
treed383749a412d02c615c3b885046d9a600c67ca49 /nova/api
parent070d87df264ca949b51131df9287fbcee373d480 (diff)
small import cleanup
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/__init__.py5
-rw-r--r--nova/api/ec2/apirequest.py2
2 files changed, 2 insertions, 5 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index 46e543d0e..7e345d297 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -22,13 +22,12 @@ Starting point for routing EC2 requests
import logging
import routes
+import webob.dec
import webob.exc
-from webob.dec import wsgify
from nova.api.ec2 import admin
from nova.api.ec2 import cloud
from nova import exception
-from nova import utils
from nova.auth import manager
@@ -101,7 +100,7 @@ class Authenticate(wsgi.Middleware):
class Router(wsgi.Application):
"""
Finds controller for a request, executes environ['ec2.action'] upon it, and
- returns a response.
+ returns an XML response. If the action fails, returns a 400.
"""
def __init__(self):
self.map = routes.Mapper()
diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py
index 77f1a7759..261346a09 100644
--- a/nova/api/ec2/apirequest.py
+++ b/nova/api/ec2/apirequest.py
@@ -23,8 +23,6 @@ APIRequest class
# TODO(termie): replace minidom with etree
from xml.dom import minidom
-from twisted.internet import defer
-
_c2u = re.compile('(((?<=[a-z])[A-Z])|([A-Z](?![A-Z]|$)))')