openstack
/
keystone
Code Issues Proposed changes

Merge "Fix E731 flake8"

This commit is contained in:
Zuul 2019-06-21 12:53:03 +00:00 committed by Gerrit Code Review
parent 29ba4b6908 1925aa9c24
commit d81225376a
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keystone/tests/unit/identity/test_core.py
View File

@ -105,8 +105,8 @@ class TestDomainConfigs(unit.BaseTestCase):
name, name,
identity.DOMAIN_CONF_FTAIL))) identity.DOMAIN_CONF_FTAIL)))
walk_fake = lambda *a, **kwa: ( def walk_fake(*a, **kwa):
('/fake/keystone/domains/config', [], files), ) return ('/fake/keystone/domains/config', [], files),
generic_driver = mock.Mock(is_sql=False) generic_driver = mock.Mock(is_sql=False)

3
keystone/tests/unit/test_backend_templated.py
View File

@ -88,7 +88,8 @@ class TestTemplatedCatalog(unit.TestCase, catalog_tests.CatalogTests):
"Templated backend doesn't have disabled endpoints") "Templated backend doesn't have disabled endpoints")
def assert_catalogs_equal(self, expected, observed): def assert_catalogs_equal(self, expected, observed):
sort_key = lambda d: d['id'] def sort_key(d):
return d['id']
for e, o in zip(sorted(expected, key=sort_key), for e, o in zip(sorted(expected, key=sort_key),
sorted(observed, key=sort_key)): sorted(observed, key=sort_key)):
expected_endpoints = e.pop('endpoints') expected_endpoints = e.pop('endpoints')

2
tools/fast8.sh
View File

@ -22,4 +22,4 @@ for FILE in $CHANGED; do
fi fi
done done
diff -u --from-file /dev/null $CHECK | flake8 --diff --ignore=D100,D101,D102,D103,D104,E305,E402,E501,W503,W504,W605,E731 diff -u --from-file /dev/null $CHECK | flake8 --diff --ignore=D100,D101,D102,D103,D104,E305,E402,E501,W503,W504,W605

5
tox.ini
View File

@ -32,7 +32,7 @@ deps =
.[bandit] .[bandit]
{[testenv]deps} {[testenv]deps}
commands = commands =
flake8 --ignore=D100,D101,D102,D103,D104,E305,E402,E501,W503,W504,W605,E731 flake8 --ignore=D100,D101,D102,D103,D104,E305,E402,E501,W503,W504,W605
# Run bash8 during pep8 runs to ensure violations are caught by # Run bash8 during pep8 runs to ensure violations are caught by
# the check and gate queues # the check and gate queues
bashate devstack/plugin.sh bashate devstack/plugin.sh
@ -127,8 +127,7 @@ enable-extensions = H203,H904
# TODO(wxy): Fix the pep8 issue. # TODO(wxy): Fix the pep8 issue.
# E402: module level import not at top of file # E402: module level import not at top of file
# W503: line break before binary operator # W503: line break before binary operator
# E731: do not assign a lambda expression, use a def ignore = D100,D101,D102,D103,D104,D203,E402,W503
ignore = D100,D101,D102,D103,D104,D203,E402,W503,E731
exclude=.venv,.git,.tox,build,dist,*lib/python*,*egg,tools,vendor,.update-venv,*.ini,*.po,*.pot exclude=.venv,.git,.tox,build,dist,*lib/python*,*egg,tools,vendor,.update-venv,*.ini,*.po,*.pot
max-complexity=24 max-complexity=24