diff options
| author | Todd Willey <todd@ansolabs.com> | 2010-12-30 02:20:31 -0500 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2010-12-30 02:20:31 -0500 |
| commit | ba31a61ae6348bffbd70d5875f12a540d49e8885 (patch) | |
| tree | 08ff40bdcf3ce4154cdcbe0cfa0665ff4d1de9ba | |
| parent | aa73649911132598a96bbd908670dc3dadf50e91 (diff) | |
| download | nova-ba31a61ae6348bffbd70d5875f12a540d49e8885.tar.gz nova-ba31a61ae6348bffbd70d5875f12a540d49e8885.tar.xz nova-ba31a61ae6348bffbd70d5875f12a540d49e8885.zip | |
pep 8
| -rw-r--r-- | nova/api/ec2/__init__.py | 7 | ||||
| -rw-r--r-- | nova/api/ec2/metadatarequesthandler.py | 1 | ||||
| -rw-r--r-- | nova/api/openstack/__init__.py | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 7bec7f81e..aa3bfaeb4 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -313,7 +313,6 @@ class Executor(wsgi.Application): resp.body = str(result) return resp - def _error(self, req, code, message): logging.error("%s: %s", code, message) resp = webob.Response() @@ -325,6 +324,7 @@ class Executor(wsgi.Application): '<RequestID>?</RequestID></Response>' % (code, message)) return resp + class Versions(wsgi.Application): @webob.dec.wsgify @@ -344,23 +344,28 @@ class Versions(wsgi.Application): ] return ''.join('%s\n' % v for v in versions) + def authenticate_factory(global_args, **local_args): def authenticator(app): return Authenticate(app) return authenticator + def router_factory(global_args, **local_args): def router(app): return Router(app) return router + def authorizer_factory(global_args, **local_args): def authorizer(app): return Authorizer(app) return authorizer + def executor_factory(global_args, **local_args): return Executor() + def versions_factory(global_args, **local_args): return Versions() diff --git a/nova/api/ec2/metadatarequesthandler.py b/nova/api/ec2/metadatarequesthandler.py index 9d1594ae7..a57a6698a 100644 --- a/nova/api/ec2/metadatarequesthandler.py +++ b/nova/api/ec2/metadatarequesthandler.py @@ -80,5 +80,6 @@ class MetadataRequestHandler(object): raise webob.exc.HTTPNotFound() return self.print_data(data) + def metadata_factory(global_args, **local_args): return MetadataRequestHandler() diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py index 5dd092a1f..dc7794876 100644 --- a/nova/api/openstack/__init__.py +++ b/nova/api/openstack/__init__.py @@ -129,5 +129,6 @@ class Versions(wsgi.Application): def router_factory(global_cof, **local_conf): return APIRouter() + def versions_factory(global_conf, **local_conf): return Versions() |