From 27b683e6a135a13ea091b953da85643c636476aa Mon Sep 17 00:00:00 2001 From: Johannes Erdfelt Date: Mon, 30 Apr 2012 19:39:14 +0000 Subject: [PATCH] Remove unnecessary return statements If they're at the end of a function/method and don't return a value, then it's superfluous Change-Id: Ibd8d43a15ee83cf51c5b7cea0b1cb6ea13d1357d --- nova/rpc/amqp.py | 1 - nova/tests/test_api.py | 4 ---- nova/tests/test_netapp.py | 2 -- 3 files changed, 7 deletions(-) diff --git a/nova/rpc/amqp.py b/nova/rpc/amqp.py index d58806c9..37f8758b 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 baaee985..d4be082b 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 01dc1aa4..579227c7 100644 --- a/nova/tests/test_netapp.py +++ b/nova/tests/test_netapp.py @@ -617,7 +617,6 @@ class FakeDfmServerHandler(BaseHTTPServer.BaseHTTPRequestHandler): out.write('') out.write('') 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):