remove pep8 E122 exemption and correct style

This change removes the E122 exemption for pep8. E122 is "continuation line missing indentation or outdented"

Change-Id: I4bd1e6c787648a3dfa69b514efeeff05996aabc1
Partial-Bug: 1329017

diff --git a/neutron/plugins/vmware/nsxlib/secgroup.py b/neutron/plugins/vmware/nsxlib/secgroup.py
index fa4a10ef10f0dd14d73aa4e9bc70f53791d77b99..d6094f2ac44fb49b72897fe106ff9dcf365e46f6 100644 (file)
--- a/neutron/plugins/vmware/nsxlib/secgroup.py
+++ b/neutron/plugins/vmware/nsxlib/secgroup.py
@@ -123,13 +123,11 @@ def update_security_group_rules(cluster, spid, rules):
 
 
 def update_security_profile(cluster, spid, name):
-    return nsxlib.do_request(HTTP_PUT,
-                             nsxlib._build_uri_path(SECPROF_RESOURCE,
-                                                    resource_id=spid),
-                             json.dumps({
-                             "display_name": utils.check_and_truncate(name)
-                             }),
-                             cluster=cluster)
+    return nsxlib.do_request(
+        HTTP_PUT,
+        nsxlib._build_uri_path(SECPROF_RESOURCE, resource_id=spid),
+        json.dumps({"display_name": utils.check_and_truncate(name)}),
+        cluster=cluster)
 
 
 def delete_security_profile(cluster, spid):

diff --git a/neutron/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py b/neutron/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py
index 562416bd412f3df95cf10e5475629da5b98888c5..b5da37ff503521519e6e94df72f591eb2563b121 100644 (file)
--- a/neutron/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py
+++ b/neutron/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py
@@ -1502,8 +1502,8 @@ class TestCiscoCsrIPsecDeviceDriverSyncStatuses(base.BaseTestCase):
                             u'ipsec_site_connections': {
                                 u'1': {u'status': constants.ACTIVE,
                                        u'updated_pending_status': True},
-                            u'2': {u'status': constants.DOWN,
-                                   u'updated_pending_status': True}}
+                                u'2': {u'status': constants.DOWN,
+                                       u'updated_pending_status': True}}
                             },
                            {u'id': u'456',
                             u'updated_pending_status': True,

diff --git a/tox.ini b/tox.ini
index bf2398df57bdbe6afb0fc58147d26df97bd4d48b..88d0fa9a257b16e25bfd05ce78a03e3831046d62 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -40,7 +40,6 @@ commands =
 commands = {posargs}
 
 [flake8]
-# E122 continuation line missing indentation or outdented
 # E125 continuation line does not distinguish itself from next logical line
 # E126 continuation line over-indented for hanging indent
 # E128 continuation line under-indented for visual indent
@@ -62,7 +61,7 @@ commands = {posargs}
 # H405 multi line docstring summary not separated with an empty line
 # H904 Wrap long lines in parentheses instead of a backslash
 # TODO(marun) H404 multi line docstring should start with a summary
-ignore = E122,E125,E126,E128,E129,E251,E265,E713,F402,F811,F812,H104,H237,H302,H304,H305,H307,H401,H402,H404,H405,H904
+ignore = E125,E126,E128,E129,E251,E265,E713,F402,F811,F812,H104,H237,H302,H304,H305,H307,H401,H402,H404,H405,H904
 show-source = true
 builtins = _
 exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools,.ropeproject