summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2012-04-30 19:39:14 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2012-04-30 19:40:13 +0000
commit8a2940052134db8ef0700597e121c3c9c43d9bd5 (patch)
treead3d435258d48b4ea13a155c9b559d02030440b7
parent1c127f79c3331bc74b0b74c4eade87be695a8828 (diff)
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
-rw-r--r--nova/rpc/amqp.py1
-rw-r--r--nova/tests/test_api.py4
-rw-r--r--nova/tests/test_netapp.py2
-rw-r--r--nova/virt/libvirt/connection.py2
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 b8ac5f0f7..8fb24a11c 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -2112,8 +2112,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.