From 317378f742aafd59d0aaa6c5698bbda57cbfa15a Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Thu, 24 May 2012 06:56:15 -0700 Subject: [PATCH] Update pep8 dependency to v1.1 The latest release of pep8 adds stricter rules for extraneous whitespace within lines. This patch also addresses these new violations acoss the codebase. Change-Id: Ib7e50281870473df1704ed50868c5c2e26bdb02e --- nova/api/openstack/compute/contrib/hosts.py | 2 +- nova/api/openstack/compute/contrib/networks.py | 2 +- .../compute/contrib/test_admin_actions.py | 2 +- .../compute/contrib/test_disk_config.py | 2 +- .../compute/contrib/test_scheduler_hints.py | 2 +- .../compute/contrib/test_security_groups.py | 4 ++-- .../contrib/test_simple_tenant_usage.py | 18 +++++++++--------- nova/virt/baremetal/nodes.py | 2 +- nova/virt/baremetal/proxy.py | 6 +++--- nova/virt/fake.py | 6 +++--- nova/virt/libvirt/connection.py | 8 ++++---- nova/virt/vmwareapi/vmops.py | 2 +- nova/virt/xenapi/connection.py | 6 +++--- nova/virt/xenapi/volume_utils.py | 2 +- nova/vnc/xvp_proxy.py | 10 +++++----- tools/hacking.py | 8 ++++---- tools/test-requires | 2 +- tools/xenserver/vdi_chain_cleanup.py | 2 +- tox.ini | 2 +- 19 files changed, 44 insertions(+), 44 deletions(-) diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py index d75aca718b10..e9d342c536b3 100644 --- a/nova/api/openstack/compute/contrib/hosts.py +++ b/nova/api/openstack/compute/contrib/hosts.py @@ -270,7 +270,7 @@ class HostController(object): vcpus = [i['vcpus'] for i in instance_refs if i['project_id'] == project_id] - mem = [i['memory_mb'] for i in instance_refs + mem = [i['memory_mb'] for i in instance_refs if i['project_id'] == project_id] disk = [i['root_gb'] + i['ephemeral_gb'] for i in instance_refs diff --git a/nova/api/openstack/compute/contrib/networks.py b/nova/api/openstack/compute/contrib/networks.py index 8b7a646a2867..59bed97c25a9 100644 --- a/nova/api/openstack/compute/contrib/networks.py +++ b/nova/api/openstack/compute/contrib/networks.py @@ -82,7 +82,7 @@ class NetworkController(object): authorize(context) networks = self.network_api.get_all(context) result = [network_dict(net_ref) for net_ref in networks] - return {'networks': result} + return {'networks': result} def show(self, req, id): context = req.environ['nova.context'] diff --git a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py index df2a26f86775..cc48b7c66f2f 100644 --- a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py +++ b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py @@ -17,7 +17,7 @@ import json import webob -from nova.api.openstack import compute as compute_api +from nova.api.openstack import compute as compute_api from nova import compute from nova import context from nova import exception diff --git a/nova/tests/api/openstack/compute/contrib/test_disk_config.py b/nova/tests/api/openstack/compute/contrib/test_disk_config.py index c9e4145e4e8d..59ae14ac8627 100644 --- a/nova/tests/api/openstack/compute/contrib/test_disk_config.py +++ b/nova/tests/api/openstack/compute/contrib/test_disk_config.py @@ -17,7 +17,7 @@ import datetime -from nova.api.openstack import compute +from nova.api.openstack import compute from nova.api.openstack.compute import extensions from nova.api.openstack import wsgi import nova.db.api diff --git a/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py b/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py index 59ad8abbc914..b5a3f765ad78 100644 --- a/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py +++ b/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.api.openstack import compute +from nova.api.openstack import compute from nova.api.openstack.compute import extensions from nova.api.openstack import wsgi import nova.db.api diff --git a/nova/tests/api/openstack/compute/contrib/test_security_groups.py b/nova/tests/api/openstack/compute/contrib/test_security_groups.py index f864ab648748..1778068bbe23 100644 --- a/nova/tests/api/openstack/compute/contrib/test_security_groups.py +++ b/nova/tests/api/openstack/compute/contrib/test_security_groups.py @@ -815,7 +815,7 @@ class TestSecurityGroupRules(test.TestCase): self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) - def _test_create_with_no_ports(self, proto): + def _test_create_with_no_ports(self, proto): rule = {'ip_protocol': proto, 'parent_group_id': '2', 'group_id': '1'} req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') @@ -844,7 +844,7 @@ class TestSecurityGroupRules(test.TestCase): self._test_create_with_no_ports_and_no_group('udp') self._test_create_with_no_ports('udp') - def _test_create_with_ports(self, id_val, proto, from_port, to_port): + def _test_create_with_ports(self, id_val, proto, from_port, to_port): rule = { 'ip_protocol': proto, 'from_port': from_port, 'to_port': to_port, 'parent_group_id': '2', 'group_id': '1' diff --git a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py index 86c8b5f00276..09b59a137ea9 100644 --- a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py +++ b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py @@ -55,15 +55,15 @@ def fake_instance_type_get(self, context, instance_type_id): def get_fake_db_instance(start, end, instance_id, tenant_id): - return {'id': instance_id, - 'image_ref': '1', - 'project_id': tenant_id, - 'user_id': 'fakeuser', - 'display_name': 'name', - 'state_description': 'state', - 'instance_type_id': 1, - 'launched_at': start, - 'terminated_at': end} + return {'id': instance_id, + 'image_ref': '1', + 'project_id': tenant_id, + 'user_id': 'fakeuser', + 'display_name': 'name', + 'state_description': 'state', + 'instance_type_id': 1, + 'launched_at': start, + 'terminated_at': end} def fake_instance_get_active_by_window(self, context, begin, end, project_id): diff --git a/nova/virt/baremetal/nodes.py b/nova/virt/baremetal/nodes.py index a01bba4281f4..b4f2a50e2919 100644 --- a/nova/virt/baremetal/nodes.py +++ b/nova/virt/baremetal/nodes.py @@ -34,7 +34,7 @@ FLAGS.register_opts(baremetal_opts) def get_baremetal_nodes(): d = FLAGS.baremetal_driver - if d == 'tilera': + if d == 'tilera': return tilera.get_baremetal_nodes() elif d == 'fake': return fake.get_baremetal_nodes() diff --git a/nova/virt/baremetal/proxy.py b/nova/virt/baremetal/proxy.py index 274c0ba036e5..90011f28bec4 100644 --- a/nova/virt/baremetal/proxy.py +++ b/nova/virt/baremetal/proxy.py @@ -666,9 +666,9 @@ class ProxyConnection(driver.ComputeDriver): #TODO(mdragon): console proxy should be implemented for baremetal, # in case someone wants to use it. # For now return fake data. - return {'address': '127.0.0.1', - 'username': 'fakeuser', - 'password': 'fakepassword'} + return {'address': '127.0.0.1', + 'username': 'fakeuser', + 'password': 'fakepassword'} def refresh_security_group_rules(self, security_group_id): # Bare metal doesn't currently support security groups diff --git a/nova/virt/fake.py b/nova/virt/fake.py index 51ea508799fc..36cfa54d20b5 100644 --- a/nova/virt/fake.py +++ b/nova/virt/fake.py @@ -225,9 +225,9 @@ class FakeConnection(driver.ComputeDriver): 'port': 6969} def get_console_pool_info(self, console_type): - return {'address': '127.0.0.1', - 'username': 'fakeuser', - 'password': 'fakepassword'} + return {'address': '127.0.0.1', + 'username': 'fakeuser', + 'password': 'fakepassword'} def refresh_security_group_rules(self, security_group_id): return True diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 23429e84d28f..7e012a87cf15 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -1900,7 +1900,7 @@ class LibvirtConnection(driver.ComputeDriver): else: avail = (int(m[idx1 + 1]) + int(m[idx2 + 1]) + int(m[idx3 + 1])) # Convert it to MB - return self.get_memory_mb_total() - avail / 1024 + return self.get_memory_mb_total() - avail / 1024 def get_local_gb_used(self): """Get the free hdd size(GB) of physical computer. @@ -2021,9 +2021,9 @@ class LibvirtConnection(driver.ComputeDriver): #TODO(mdragon): console proxy should be implemented for libvirt, # in case someone wants to use it with kvm or # such. For now return fake data. - return {'address': '127.0.0.1', - 'username': 'fakeuser', - 'password': 'fakepassword'} + return {'address': '127.0.0.1', + 'username': 'fakeuser', + 'password': 'fakepassword'} def refresh_security_group_rules(self, security_group_id): self.firewall_driver.refresh_security_group_rules(security_group_id) diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py index f236b6ac9a68..1e35776fa303 100644 --- a/nova/virt/vmwareapi/vmops.py +++ b/nova/virt/vmwareapi/vmops.py @@ -793,7 +793,7 @@ class VMWareVMOps(object): task_info = self._session._call_method(vim_util, "get_dynamic_property", search_task, "Task", "info") - if task_info.state in ['queued', 'running']: + if task_info.state in ['queued', 'running']: time.sleep(2) continue break diff --git a/nova/virt/xenapi/connection.py b/nova/virt/xenapi/connection.py index 35634ac11162..184e34aa4ec4 100644 --- a/nova/virt/xenapi/connection.py +++ b/nova/virt/xenapi/connection.py @@ -366,9 +366,9 @@ class XenAPIConnection(driver.ComputeDriver): def get_console_pool_info(self, console_type): xs_url = urlparse.urlparse(FLAGS.xenapi_connection_url) - return {'address': xs_url.netloc, - 'username': FLAGS.xenapi_connection_username, - 'password': FLAGS.xenapi_connection_password} + return {'address': xs_url.netloc, + 'username': FLAGS.xenapi_connection_username, + 'password': FLAGS.xenapi_connection_password} def update_available_resource(self, ctxt, host): """Updates compute manager resource info on ComputeNode table. diff --git a/nova/virt/xenapi/volume_utils.py b/nova/virt/xenapi/volume_utils.py index 9c207a4cd1a0..e93e1b81eb1c 100644 --- a/nova/virt/xenapi/volume_utils.py +++ b/nova/virt/xenapi/volume_utils.py @@ -373,7 +373,7 @@ def _get_target_port(iscsi_string): """Retrieve target port""" if iscsi_string: return iscsi_string[iscsi_string.find(':') + 1:] - elif iscsi_string is None or FLAGS.target_port: + elif iscsi_string is None or FLAGS.target_port: return FLAGS.target_port diff --git a/nova/vnc/xvp_proxy.py b/nova/vnc/xvp_proxy.py index 1eca54530c5b..593b4aa9fc63 100644 --- a/nova/vnc/xvp_proxy.py +++ b/nova/vnc/xvp_proxy.py @@ -178,8 +178,8 @@ def get_wsgi_server(): LOG.audit(_("Starting nova-xvpvncproxy node (version %s)"), version.version_string_with_vcs()) - return wsgi.Server("XCP VNC Proxy", - XCPVNCProxy(), - protocol=SafeHttpProtocol, - host=FLAGS.xvpvncproxy_host, - port=FLAGS.xvpvncproxy_port) + return wsgi.Server("XCP VNC Proxy", + XCPVNCProxy(), + protocol=SafeHttpProtocol, + host=FLAGS.xvpvncproxy_host, + port=FLAGS.xvpvncproxy_port) diff --git a/tools/hacking.py b/tools/hacking.py index 6a9b1bdc87fd..485030f9911f 100755 --- a/tools/hacking.py +++ b/tools/hacking.py @@ -61,7 +61,7 @@ def import_normalize(line): split_line[2] == "import" and split_line[3] != "*" and split_line[1] != "__future__" and (len(split_line) == 4 or - (len(split_line) == 6 and split_line[4] == "as"))): + (len(split_line) == 6 and split_line[4] == "as"))): mod = split_line[3] return "import %s.%s" % (split_line[1], split_line[3]) else: @@ -214,8 +214,8 @@ def nova_import_alphabetical(physical_line, line_number, lines): ).strip().lower().split() # with or without "as y" length = [2, 4] - if (len(split_line) in length and len(split_previous) in length and - split_line[0] == "import" and split_previous[0] == "import"): + if (len(split_line) in length and len(split_previous) in length and + split_line[0] == "import" and split_previous[0] == "import"): if split_line[1] < split_previous[1]: return (0, "NOVA N306: imports not in alphabetical order (%s, %s)" % (split_previous[1], split_line[1])) @@ -244,7 +244,7 @@ def nova_docstring_one_line(physical_line): """ pos = max([physical_line.find(i) for i in DOCSTRING_TRIPLE]) # start end = max([physical_line[-4:-1] == i for i in DOCSTRING_TRIPLE]) # end - if (pos != -1 and end and len(physical_line) > pos + 4): + if (pos != -1 and end and len(physical_line) > pos + 4): if (physical_line[-5] != '.'): return pos, "NOVA N402: one line docstring needs a period" diff --git a/tools/test-requires b/tools/test-requires index 337e6e388e0c..51ef2ff632c6 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -6,6 +6,6 @@ mox==0.5.3 nose nosexcover openstack.nose_plugin -pep8==1.0.1 +pep8==1.1 sphinx>=1.1.2 MySQL-python diff --git a/tools/xenserver/vdi_chain_cleanup.py b/tools/xenserver/vdi_chain_cleanup.py index 4d4892d8be62..de1744c5b4f6 100644 --- a/tools/xenserver/vdi_chain_cleanup.py +++ b/tools/xenserver/vdi_chain_cleanup.py @@ -94,7 +94,7 @@ def main(): stdout = stdout.strip() - if stdout.endswith('.vhd'): + if stdout.endswith('.vhd'): try: descendents[stdout].append(fname) except KeyError: diff --git a/tox.ini b/tox.ini index 7108fb529f0d..a3820cad1f9d 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ sitepackages = True downloadcache = ~/cache/pip [testenv:pep8] -deps = pep8==1.0.1 +deps = pep8==1.1 commands = /bin/bash run_tests.sh -N --pep8 [testenv:coverage]