Merge "Enable W503 for flake8 check"

This commit is contained in:
Zuul 2020-05-17 14:07:15 +00:00 committed by Gerrit Code Review
commit fe54fdbc34
3 changed files with 8 additions and 8 deletions

View File

@ -624,8 +624,8 @@ class DockerWorker(object):
split_vol = vol.split(':')
if (len(split_vol) == 2
and ('/' not in split_vol[0] or '/' in split_vol[1])):
if (len(split_vol) == 2 and
('/' not in split_vol[0] or '/' in split_vol[1])):
split_vol.append('rw')
vol_list.append(split_vol[1])

View File

@ -61,9 +61,9 @@ def genpwd(passwords_file, length, uuid_keys, ssh_keys, blank_keys,
for k, v in passwords.items():
if (k in ssh_keys and
(v is None
or v.get('public_key') is None
and v.get('private_key') is None)):
(v is None or
v.get('public_key') is None and
v.get('private_key') is None)):
private_key, public_key = generate_RSA()
passwords[k] = {
'private_key': private_key,

View File

@ -98,10 +98,10 @@ commands =
[flake8]
show-source = True
# NOTE: Default ignore list is *not* empty!
# TODO: Enable either W503 or W504:
# W503 line break before binary operator
# W504 line break after binary operator
ignore = W503,W504
# (W503 and W504 are incompatible and we need to choose one of them.
# Existing codes follows W503, so we disable W504.):
ignore = W504
exclude=.eggs,.git,.tox,doc
[testenv:lower-constraints]