summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLvov Maxim <usrleon@gmail.com>2011-06-11 00:42:44 +0400
committerLvov Maxim <usrleon@gmail.com>2011-06-11 00:42:44 +0400
commit8ded8e4bde3825efc8a886aad40d54d0c9d126dc (patch)
tree8ffbe1ca02b13189ea4c5b45ae9ea6d2ebf51969
parent8de8ed78c2d3d6ca8342134234e0cc361611de54 (diff)
downloadnova-8ded8e4bde3825efc8a886aad40d54d0c9d126dc.tar.gz
nova-8ded8e4bde3825efc8a886aad40d54d0c9d126dc.tar.xz
nova-8ded8e4bde3825efc8a886aad40d54d0c9d126dc.zip
small pep8 fixes
-rwxr-xr-xbin/nova-manage6
-rw-r--r--nova/network/manager.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index 0b92c349a..23ebe3c93 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -1301,9 +1301,9 @@ def main():
action, fn = matches[0]
# For not decorated methods
- arguments = getattr(fn ,'arguments', '')
- optargs = getattr(fn ,'optargs', '')
- options = getattr(fn ,'options', '')
+ arguments = getattr(fn, 'arguments', '')
+ optargs = getattr(fn, 'optargs', '')
+ options = getattr(fn, 'options', '')
usage = "%prog " + "%s %s <args> [options]" % (sys.argv[2], sys.argv[3])
parser = OptionParser(usage=usage)
diff --git a/nova/network/manager.py b/nova/network/manager.py
index ad93114fe..a7f5aac60 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -571,7 +571,7 @@ class VlanManager(NetworkManager):
net['dhcp_start'] = str(project_net[3])
net['vlan'] = vlan
net['bridge'] = 'br%s' % vlan
- if kwargs.has_key('project_id'):
+ if 'project_id' in kwargs:
net['project_id'] = kwargs['project_id']
if(FLAGS.use_ipv6):
cidr_v6 = '%s/%s' % (fixed_net_v6[start_v6],