Merge "Fix one remaining E125 error and remove it from ignore list"

This commit is contained in:
Jenkins 2015-04-09 19:11:46 +00:00 committed by Gerrit Code Review
commit aa1215a5ad
2 changed files with 5 additions and 7 deletions

View File

@ -641,9 +641,9 @@ class ClientV2UnicodeTestXML(ClientV2TestJson):
class CLITestV20ExceptionHandler(CLITestV20Base):
def _test_exception_handler_v20(
self, expected_exception, status_code, expected_msg,
error_type=None, error_msg=None, error_detail=None,
error_content=None):
self, expected_exception, status_code, expected_msg,
error_type=None, error_msg=None, error_detail=None,
error_content=None):
if error_content is None:
error_content = {'NeutronError': {'type': error_type,
'message': error_msg,

View File

@ -37,10 +37,8 @@ commands=
downloadcache = ~/cache/pip
[flake8]
# E125 continuation line does not distinguish itself from next logical line
#
# TODO Fix the following rules from hacking 0.9.x
# H405 multi line docstring summary not separated with an empty line
ignore = E125,H405
# (mutli line docstring is used in unit tests frequently)
ignore = H405
show-source = true
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools