diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-30 20:15:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-30 20:15:37 +0000 |
| commit | 4513e75031bb2fab239cc065fb0ed4d4918e5a77 (patch) | |
| tree | cdffa0a190cb7e600d05c1735cef624dd6ef18ac | |
| parent | c1b664fd16e8c258eff7e983f6f8b7e00445eeb4 (diff) | |
| parent | 8a2940052134db8ef0700597e121c3c9c43d9bd5 (diff) | |
Merge "Remove unnecessary return statements"
| -rw-r--r-- | nova/rpc/amqp.py | 1 | ||||
| -rw-r--r-- | nova/tests/test_api.py | 4 | ||||
| -rw-r--r-- | nova/tests/test_netapp.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/connection.py | 2 |
4 files changed, 0 insertions, 9 deletions
diff --git a/nova/rpc/amqp.py b/nova/rpc/amqp.py index d58806c9e..37f8758b5 100644 --- a/nova/rpc/amqp.py +++ b/nova/rpc/amqp.py @@ -272,7 +272,6 @@ class ProxyCallback(object): LOG.exception('Exception during message handling') ctxt.reply(None, sys.exc_info(), connection_pool=self.connection_pool) - return class MulticallWaiter(object): diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py index baaee9857..d4be082b6 100644 --- a/nova/tests/test_api.py +++ b/nova/tests/test_api.py @@ -475,8 +475,6 @@ class ApiEc2TestCase(test.TestCase): self.assertEqual(len(rv), 1) self.assertEqual(rv[0].name, 'default') - return - def test_authorize_revoke_security_group_cidr_v6(self): """ Test that we can add and remove CIDR based rules @@ -529,8 +527,6 @@ class ApiEc2TestCase(test.TestCase): self.assertEqual(len(rv), 1) self.assertEqual(rv[0].name, 'default') - return - def test_authorize_revoke_security_group_foreign_group(self): """ Test that we can grant and revoke another security group access diff --git a/nova/tests/test_netapp.py b/nova/tests/test_netapp.py index 01dc1aa47..579227c78 100644 --- a/nova/tests/test_netapp.py +++ b/nova/tests/test_netapp.py @@ -617,7 +617,6 @@ class FakeDfmServerHandler(BaseHTTPServer.BaseHTTPRequestHandler): out.write('</operation>') out.write('</binding>') out.write(WSDL_TRAILER) - return def do_POST(s): """Respond to a POST request.""" @@ -825,7 +824,6 @@ class FakeDfmServerHandler(BaseHTTPServer.BaseHTTPRequestHandler): s.wfile.write(RESPONSE_PREFIX) s.wfile.write(body) s.wfile.write(RESPONSE_SUFFIX) - return class FakeHttplibSocket(object): diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 8b135bd22..f3524d873 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -2116,8 +2116,6 @@ class LibvirtConnection(driver.ComputeDriver): if ret <= 0: raise exception.InvalidCPUInfo(reason=m % locals()) - return - def ensure_filtering_rules_for_instance(self, instance_ref, network_info, time=None): """Setting up filtering rules and waiting for its completion. |