summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2011-01-19 15:16:12 -0500
committerTodd Willey <todd@ansolabs.com>2011-01-19 15:16:12 -0500
commit46c1c554e7d98959a2b20597d6b0f2b0f648cdc9 (patch)
tree368f8a98531dac54672924de526a05eda325f1d0
parent19aae256676e45a8147f25553398ca980b3e1bd4 (diff)
Whitespace (pep8) cleanups.
-rw-r--r--nova/adminclient.py29
-rw-r--r--nova/api/ec2/admin.py1
2 files changed, 14 insertions, 16 deletions
diff --git a/nova/adminclient.py b/nova/adminclient.py
index 90ad4d9dd..0cdb8c6fb 100644
--- a/nova/adminclient.py
+++ b/nova/adminclient.py
@@ -190,20 +190,20 @@ class HostInfo(object):
setattr(self, name, value)
-class SimpleResponse(object):
- def __init__(self, connection=None):
- self.connection = connection
- self.status = None
+class SimpleResponse(object):
+ def __init__(self, connection=None):
+ self.connection = connection
+ self.status = None
self.message = ''
-
- def __repr__(self):
- return 'Status:%s' % self.status
-
- def startElement(self, name, attrs, connection):
- return None
-
- def endElement(self, name, value, connection):
- setattr(self, name.lower(), str(value))
+
+ def __repr__(self):
+ return 'Status:%s' % self.status
+
+ def startElement(self, name, attrs, connection):
+ return None
+
+ def endElement(self, name, value, connection):
+ setattr(self, name.lower(), str(value))
class NovaAdminClient(object):
@@ -224,8 +224,7 @@ class NovaAdminClient(object):
self.apiconn = boto.connect_ec2(aws_access_key_id=access_key,
aws_secret_access_key=secret_key,
is_secure=parts['is_secure'],
- region=RegionInfo(None,
- region,
+ region=RegionInfo(None, region,
parts['ip']),
port=parts['port'],
path='/services/Admin',
diff --git a/nova/api/ec2/admin.py b/nova/api/ec2/admin.py
index 1ae5f7094..3a8ed39eb 100644
--- a/nova/api/ec2/admin.py
+++ b/nova/api/ec2/admin.py
@@ -226,7 +226,6 @@ class AdminController(object):
return dupe
return False
-
def block_external_addresses(self, context, cidr):
"""Add provider-level firewall rules to block incoming traffic."""
LOG.audit(_("Blocking traffic to all projects incoming from %s"),