openstack/swift
Code Issues Proposed changes

Fix pep8 job

Browse Source 
New flake8 came out with new & improved rules. Ignore E741; it would be
too much churn. Fix the rest.

Change-Id: I9125c8c53423232309a75cbcc5b695b378864c1b
This commit is contained in:
Tim Burke 2020-05-13 00:24:08 -07:00
parent d050ef82f7
commit 0fd23ee546
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/cli/ringbuilder.py
View File

@ -1658,7 +1658,7 @@ def main(arguments=None):
print(msg) print(msg)
exit(EXIT_ERROR) exit(EXIT_ERROR)
except (exceptions.FileNotFoundError, exceptions.PermissionError) as e: except (exceptions.FileNotFoundError, exceptions.PermissionError) as e:
if len(argv) < 3 or argv[2] not in('create', 'write_builder'): if len(argv) < 3 or argv[2] not in ('create', 'write_builder'):
print(e) print(e)
exit(EXIT_ERROR) exit(EXIT_ERROR)
except Exception as e: except Exception as e:

2
test/unit/common/ring/test_builder.py
View File

@ -2113,7 +2113,7 @@ class TestRingBuilder(unittest.TestCase):
orig_rb = ring.RingBuilder(8, 3, 1) orig_rb = ring.RingBuilder(8, 3, 1)
copy_rb = ring.RingBuilder(8, 3, 1) copy_rb = ring.RingBuilder(8, 3, 1)
copy_rb.copy_from(orig_rb) copy_rb.copy_from(orig_rb)
for rb in(orig_rb, copy_rb): for rb in (orig_rb, copy_rb):
with self.assertRaises(AttributeError) as cm: with self.assertRaises(AttributeError) as cm:
rb.id rb.id
self.assertIn('id attribute has not been initialised', self.assertIn('id attribute has not been initialised',

2
test/unit/common/test_db.py
View File

@ -1289,7 +1289,7 @@ class TestDatabaseBroker(unittest.TestCase):
for c in range(MAX_META_COUNT): for c in range(MAX_META_COUNT):
key = 'X-Account-Meta-F{0}'.format(c) key = 'X-Account-Meta-F{0}'.format(c)
metadata[key] = ('B', normalize_timestamp(1)) metadata[key] = ('B', normalize_timestamp(1))
key = 'X-Account-Meta-Foo'.format(c) key = 'X-Account-Meta-Foo'
metadata[key] = ('', normalize_timestamp(1)) metadata[key] = ('', normalize_timestamp(1))
self.assertIsNone(DatabaseBroker.validate_metadata(metadata)) self.assertIsNone(DatabaseBroker.validate_metadata(metadata))

3
tox.ini
View File

@ -143,10 +143,11 @@ commands = bandit -c bandit.yaml -r swift -n 5
# changes to enable: # changes to enable:
# E402: module level import not at top of file # E402: module level import not at top of file
# E731 do not assign a lambda expression, use a def # E731 do not assign a lambda expression, use a def
# E741 ambiguous variable name
# Swift team needs to decide if they want to enable either of these: # Swift team needs to decide if they want to enable either of these:
# W503: line break before binary operator # W503: line break before binary operator
# W504: line break after binary operator # W504: line break after binary operator
ignore = H101,H202,H301,H306,H404,H405,H501,W503,W504,E402,E731 ignore = H101,H202,H301,H306,H404,H405,H501,W503,W504,E402,E731,E741
exclude = .venv,.tox,dist,*egg exclude = .venv,.tox,dist,*egg
filename = *.py,bin/* filename = *.py,bin/*
show-source = True show-source = True