diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-20 18:57:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-20 18:57:44 +0000 |
| commit | e79a88e9ff00ee3ca54620210bea8050820fa1ab (patch) | |
| tree | 94566cab479f37588a478923fc1e4003c2de44ce | |
| parent | 91e019f76746206e109b15957b2bdf59fbf15bcf (diff) | |
| parent | 78f6d9f15aa062ec9221410d65f6a08526b1d7a6 (diff) | |
| download | nova-e79a88e9ff00ee3ca54620210bea8050820fa1ab.tar.gz nova-e79a88e9ff00ee3ca54620210bea8050820fa1ab.tar.xz nova-e79a88e9ff00ee3ca54620210bea8050820fa1ab.zip | |
Merge "Fix missing imports and bad call caught by pyflakes"
| -rw-r--r-- | nova/vnc/xvp_proxy.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nova/vnc/xvp_proxy.py b/nova/vnc/xvp_proxy.py index fa1845726..1bcc83240 100644 --- a/nova/vnc/xvp_proxy.py +++ b/nova/vnc/xvp_proxy.py @@ -18,8 +18,6 @@ """Eventlet WSGI Services to proxy VNC for XCP protocol.""" -import base64 -import os import socket import webob @@ -103,7 +101,7 @@ class XCPVNCProxy(object): sockets['client'] = client sockets['server'] = server - def proxy_connection(self, req, connect_info): + def proxy_connection(self, req, connect_info, start_response): """Spawn bi-directional vnc proxy.""" sockets = {} t0 = eventlet.spawn(self.handshake, req, connect_info, sockets) @@ -149,7 +147,7 @@ class XCPVNCProxy(object): [('content-type', 'text/html')]) return "Not Authorized" - self.proxy_connection(req, connect_info) + return self.proxy_connection(req, connect_info, start_response) except Exception as e: LOG.audit(_("Unexpected error: %s"), e) |