Update pep8 rules

Remove E402 from flake8 list, issues are fixed or addressed with noqa.
Remove E305 as comment, the warning is enabled.
Enable E241 and fix all problems

Change-Id: Ifd2bbce98be4206908da769df686a370328c7ee1

16 files changed, 24 insertions, 24 deletions

diff --git a/heat/common/policy.py b/heat/common/policy.py
index 86e26dd5c..38971e001 100644
--- a/heat/common/policy.py
+++ b/heat/common/policy.py
@@ -146,7 +146,7 @@ class ResourceEnforcer(Enforcer):
             result = super(ResourceEnforcer, self).enforce(
                 context, res_type,
                 scope=scope or 'resource_types',
-                target=target,  is_registered_policy=is_registered_policy)
+                target=target, is_registered_policy=is_registered_policy)
         except policy.PolicyNotRegistered:
             result = True
         except self.exc as ex:
diff --git a/heat/db/sqlalchemy/api.py b/heat/db/sqlalchemy/api.py
index 8dc6b2b24..9e7ac021e 100644
--- a/heat/db/sqlalchemy/api.py
+++ b/heat/db/sqlalchemy/api.py
@@ -693,7 +693,7 @@ def _paginate_query(context, query, model, limit=None, sort_keys=None,
     return query
 
 
-def _query_stack_get_all(context,  show_deleted=False,
+def _query_stack_get_all(context, show_deleted=False,
                          show_nested=False, show_hidden=False, tags=None,
                          tags_any=None, not_tags=None, not_tags_any=None):
     if show_nested:
diff --git a/heat/engine/resources/openstack/blazar/host.py b/heat/engine/resources/openstack/blazar/host.py
index e8745dac6..272fe90ce 100644
--- a/heat/engine/resources/openstack/blazar/host.py
+++ b/heat/engine/resources/openstack/blazar/host.py
@@ -41,7 +41,7 @@ class Host(resource.Resource):
     )
 
     ATTRIBUTES = (
-        HYPERVISOR_HOSTNAME, HYPERVISOR_TYPE,  HYPERVISOR_VERSION,
+        HYPERVISOR_HOSTNAME, HYPERVISOR_TYPE, HYPERVISOR_VERSION,
         VCPUS, CPU_INFO, MEMORY_MB, LOCAL_GB,
         SERVICE_NAME, RESERVABLE, STATUS, TRUST_ID,
         EXTRA_CAPABILITY_ATTR, CREATED_AT, UPDATED_AT,
diff --git a/heat/engine/resources/openstack/neutron/floatingip.py b/heat/engine/resources/openstack/neutron/floatingip.py
index 8f2e481af..a56a0163d 100644
--- a/heat/engine/resources/openstack/neutron/floatingip.py
+++ b/heat/engine/resources/openstack/neutron/floatingip.py
@@ -41,7 +41,7 @@ class FloatingIP(neutron.NeutronResource):
     entity = 'floatingip'
 
     PROPERTIES = (
-        FLOATING_NETWORK_ID, FLOATING_NETWORK,  FLOATING_SUBNET,
+        FLOATING_NETWORK_ID, FLOATING_NETWORK, FLOATING_SUBNET,
         VALUE_SPECS, PORT_ID, FIXED_IP_ADDRESS, FLOATING_IP_ADDRESS,
         DNS_NAME, DNS_DOMAIN,
     ) = (
diff --git a/heat/engine/resources/openstack/neutron/qos.py b/heat/engine/resources/openstack/neutron/qos.py
index 683aecbf2..d767050ae 100644
--- a/heat/engine/resources/openstack/neutron/qos.py
+++ b/heat/engine/resources/openstack/neutron/qos.py
@@ -111,7 +111,7 @@ class QoSRule(neutron.NeutronResource):
     support_status = support.SupportStatus(version='6.0.0')
 
     PROPERTIES = (
-        POLICY,  TENANT_ID,
+        POLICY, TENANT_ID,
     ) = (
         'policy', 'tenant_id',
     )
diff --git a/heat/engine/resources/server_base.py b/heat/engine/resources/server_base.py
index ce12693a0..fec88f07a 100644
--- a/heat/engine/resources/server_base.py
+++ b/heat/engine/resources/server_base.py
@@ -98,7 +98,7 @@ class BaseServer(stack_user.StackUser):
             occ.update({'zaqar': {
                 'user_id': self._get_user_id(),
                 'password': self.password,
-                'auth_url':  self.keystone().server_keystone_endpoint_url(
+                'auth_url': self.keystone().server_keystone_endpoint_url(
                     fallback_endpoint=self.context.auth_url),
                 'project_id': self.stack.stack_user_project_id,
                 'queue_id': queue_id,
diff --git a/heat/engine/resources/signal_responder.py b/heat/engine/resources/signal_responder.py
index 4ce4b89b7..1744de488 100644
--- a/heat/engine/resources/signal_responder.py
+++ b/heat/engine/resources/signal_responder.py
@@ -106,7 +106,7 @@ class SignalResponder(stack_user.StackUser):
             if self.password is None:
                 self.password = password_gen.generate_openstack_password()
             self._create_user()
-        return {'auth_url':  self.keystone().server_keystone_endpoint_url(
+        return {'auth_url': self.keystone().server_keystone_endpoint_url(
                 fallback_endpoint=self.keystone().v3_endpoint),
                 'username': self.physical_resource_name(),
                 'user_id': self._get_user_id(),
diff --git a/heat/tests/openstack/cinder/test_qos_specs.py b/heat/tests/openstack/cinder/test_qos_specs.py
index e00eda73e..b77cd728f 100644
--- a/heat/tests/openstack/cinder/test_qos_specs.py
+++ b/heat/tests/openstack/cinder/test_qos_specs.py
@@ -22,7 +22,7 @@ from heat.tests import utils
 
 QOS_SPECS_TEMPLATE = {
     'heat_template_version': '2015-10-15',
-    'description':  'Cinder QoS specs creation example',
+    'description': 'Cinder QoS specs creation example',
     'resources': {
         'my_qos_specs': {
             'type': 'OS::Cinder::QoSSpecs',
@@ -36,7 +36,7 @@ QOS_SPECS_TEMPLATE = {
 
 QOS_ASSOCIATE_TEMPLATE = {
     'heat_template_version': '2015-10-15',
-    'description':  'Cinder QoS specs association example',
+    'description': 'Cinder QoS specs association example',
     'resources': {
         'my_qos_associate': {
             'type': 'OS::Cinder::QoSAssociation',
diff --git a/heat/tests/openstack/neutron/test_sfc/test_flow_classifier.py b/heat/tests/openstack/neutron/test_sfc/test_flow_classifier.py
index eed5f2793..5f5113c77 100644
--- a/heat/tests/openstack/neutron/test_sfc/test_flow_classifier.py
+++ b/heat/tests/openstack/neutron/test_sfc/test_flow_classifier.py
@@ -201,4 +201,4 @@ class FlowClassifierTest(common.HeatTestCase):
             {
                 'name': 'name-updated',
                 'description': 'description-updated',
-            },  self.test_resource.resource_id)
+            }, self.test_resource.resource_id)
diff --git a/heat/tests/openstack/neutron/test_sfc/test_port_chain.py b/heat/tests/openstack/neutron/test_sfc/test_port_chain.py
index ead7cceff..bfa073cba 100644
--- a/heat/tests/openstack/neutron/test_sfc/test_port_chain.py
+++ b/heat/tests/openstack/neutron/test_sfc/test_port_chain.py
@@ -168,4 +168,4 @@ class PortChainTest(common.HeatTestCase):
                 'description': 'description-updated',
                 'port_pair_groups': ['port_pair_group_2'],
                 'flow_classifiers': ['flow_classifier2'],
-            },  self.test_resource.resource_id)
+            }, self.test_resource.resource_id)
diff --git a/heat/tests/openstack/neutron/test_sfc/test_port_pair.py b/heat/tests/openstack/neutron/test_sfc/test_port_pair.py
index 1d86ae244..5bb9c7003 100644
--- a/heat/tests/openstack/neutron/test_sfc/test_port_pair.py
+++ b/heat/tests/openstack/neutron/test_sfc/test_port_pair.py
@@ -27,8 +27,8 @@ sample_template = {
             'properties': {
                 'name': 'test_port_pair',
                 'description': 'desc',
-                'ingress':  '6af055d3-26f6-48dd-a597-7611d7e58d35',
-                'egress':  '6af055d3-26f6-48dd-a597-7611d7e58d35',
+                'ingress': '6af055d3-26f6-48dd-a597-7611d7e58d35',
+                'egress': '6af055d3-26f6-48dd-a597-7611d7e58d35',
                 'service_function_parameters': {'correlation': None}
             }
         }
@@ -155,4 +155,4 @@ class PortPairTest(common.HeatTestCase):
             {
                 'name': 'name-updated',
                 'description': 'description-updated',
-            },  self.test_resource.resource_id)
+            }, self.test_resource.resource_id)
diff --git a/heat/tests/openstack/neutron/test_sfc/test_port_pair_group.py b/heat/tests/openstack/neutron/test_sfc/test_port_pair_group.py
index f9590b95d..c1d73e228 100644
--- a/heat/tests/openstack/neutron/test_sfc/test_port_pair_group.py
+++ b/heat/tests/openstack/neutron/test_sfc/test_port_pair_group.py
@@ -28,7 +28,7 @@ sample_template = {
             'properties': {
                 'name': 'test_port_pair_group',
                 'description': 'desc',
-                'port_pairs':  ['port1']
+                'port_pairs': ['port1']
                 }
             }
         }
@@ -155,7 +155,7 @@ class PortPairGroupTest(common.HeatTestCase):
             {
                 'name': 'name-updated',
                 'description': 'description-updated',
-            },  self.test_resource.resource_id)
+            }, self.test_resource.resource_id)
 
     def test_resource_handle_update_port_pairs(self):
         self.patchobject(self.test_client_plugin,
@@ -181,4 +181,4 @@ class PortPairGroupTest(common.HeatTestCase):
                 'name': 'name',
                 'description': 'description',
                 'port_pairs': ['port2'],
-            },  self.test_resource.resource_id)
+            }, self.test_resource.resource_id)
diff --git a/heat/tests/openstack/neutron/test_taas/test_tap_flow.py b/heat/tests/openstack/neutron/test_taas/test_tap_flow.py
index 52500a1f2..7cf0095c4 100644
--- a/heat/tests/openstack/neutron/test_taas/test_tap_flow.py
+++ b/heat/tests/openstack/neutron/test_taas/test_tap_flow.py
@@ -27,8 +27,8 @@ sample_template = {
             'properties': {
                 'name': 'test_tap_flow',
                 'description': 'desc',
-                'port':  '6af055d3-26f6-48dd-a597-7611d7e58d35',
-                'tap_service':  '6af055d3-26f6-48dd-a597-7611d7e58d35',
+                'port': '6af055d3-26f6-48dd-a597-7611d7e58d35',
+                'tap_service': '6af055d3-26f6-48dd-a597-7611d7e58d35',
                 'direction': 'BOTH',
                 'vlan_filter': '1-5,9,18,27-30,99-108,4000-4095'
             }
@@ -177,4 +177,4 @@ class TapFlowTest(common.HeatTestCase):
                 'tap_service': '6af055d3-26f6-48dd-a597-7611d7e58d35',
                 'direction': 'BOTH',
                 'vlan_filter': '1-5,9,18,27-30,99-108,4000-4095',
-            },  self.test_resource.resource_id)
+            }, self.test_resource.resource_id)
diff --git a/heat/tests/openstack/neutron/test_taas/test_tap_service.py b/heat/tests/openstack/neutron/test_taas/test_tap_service.py
index 23db0aca8..03fb3e5cf 100644
--- a/heat/tests/openstack/neutron/test_taas/test_tap_service.py
+++ b/heat/tests/openstack/neutron/test_taas/test_tap_service.py
@@ -27,7 +27,7 @@ sample_template = {
             'properties': {
                 'name': 'test_tap_service',
                 'description': 'desc',
-                'port':  '6af055d3-26f6-48dd-a597-7611d7e58d35',
+                'port': '6af055d3-26f6-48dd-a597-7611d7e58d35',
             }
         }
     }
@@ -149,4 +149,4 @@ class TapServiceTest(common.HeatTestCase):
                 'name': 'name-updated',
                 'description': 'description-updated',
                 'port': '6af055d3-26f6-48dd-a597-7611d7e58d35',
-            },  self.test_resource.resource_id)
+            }, self.test_resource.resource_id)
diff --git a/heat/tests/openstack/nova/fakes.py b/heat/tests/openstack/nova/fakes.py
index b916e6f2c..c87fa510d 100644
--- a/heat/tests/openstack/nova/fakes.py
+++ b/heat/tests/openstack/nova/fakes.py
@@ -45,7 +45,7 @@ class FakeClient(fakes.FakeClient, Client):
 
 class FakeSessionClient(base_client.SessionClient):
 
-    def __init__(self,  *args, **kwargs):
+    def __init__(self, *args, **kwargs):
         super(FakeSessionClient, self).__init__(*args, **kwargs)
         self.callstack = []
 
diff --git a/heat/tests/openstack/nova/test_host_aggregate.py b/heat/tests/openstack/nova/test_host_aggregate.py
index 0c63fec18..676f5e5c4 100644
--- a/heat/tests/openstack/nova/test_host_aggregate.py
+++ b/heat/tests/openstack/nova/test_host_aggregate.py
@@ -21,7 +21,7 @@ from heat.tests import utils
 
 AGGREGATE_TEMPLATE = {
     'heat_template_version': '2013-05-23',
-    'description':  'Heat Aggregate creation example',
+    'description': 'Heat Aggregate creation example',
     'resources': {
         'my_aggregate': {
             'type': 'OS::Nova::HostAggregate',