PR#294: FIX W504 warning: Line break occurred after a binary operator - waiverdb

waiverdb

#294 FIX W504 warning: Line break occurred after a binary operator

Merged 5 years ago by gnaponie. Opened 5 years ago by rayson.

rayson/waiverdb fix-w504 into master

FIX W504 warning: Line break occurred after a binary operator

Yuxiang Zhu • 5 years ago

f4ac1e7

tests/test_monitor.py

file modified

+8 -8

		`@@ -13,11 +13,11 @@`

		`assert r.status_code == 200`
		`assert len([l for l in r.get_data(as_text=True).splitlines()`
		`- if l.startswith('# TYPE messaging_') and`
		`- l.endswith(' counter')]) == 4`
		`+ if l.startswith('# TYPE messaging_')`
		`+ and l.endswith(' counter')]) == 4`
		`assert len([l for l in r.get_data(as_text=True).splitlines()`
		`- if l.startswith('# TYPE db_') and`
		`- l.endswith(' counter')]) == 4`
		`+ if l.startswith('# TYPE db_')`
		`+ and l.endswith(' counter')]) == 4`


		`def test_standalone_metrics_server_disabled_by_default():`
		`@@ -32,8 +32,8 @@`
		`r = requests.get('http://127.0.0.1:10040/metrics')`

		`assert len([l for l in r.text.splitlines()`
		`- if l.startswith('# TYPE messaging_') and`
		`- l.endswith(' counter')]) == 4`
		`+ if l.startswith('# TYPE messaging_')`
		`+ and l.endswith(' counter')]) == 4`
		`assert len([l for l in r.text.splitlines()`
		`- if l.startswith('# TYPE db_') and`
		`- l.endswith(' counter')]) == 4`
		`+ if l.startswith('# TYPE db_')`
		`+ and l.endswith(' counter')]) == 4`

tox.ini

file modified

+2 -1

		`@@ -45,4 +45,5 @@`
		`exclude = .git,.tox,dist,egg,env_waiverdb,fedmsg.d,docs,conf,waiverdb/migrations`

		`# E124: closing bracket does not match visual indentation`
		`- ignore = E124`
		`+ # W503 line break before binary operator`
		`+ ignore = E124, W503`

waiverdb/models/waivers.py

file modified

+3 -3

		`@@ -12,9 +12,9 @@`
		`This maps from the old style to the new, for backwards compatibility.`
		`"""`
		`# handling the special cases...`
		`- if (subject.get('type') in ['koji_build', 'brew-build'] and`
		`- 'item' in subject and`
		`- isinstance(subject['item'], str)):`
		`+ if (subject.get('type') in ['koji_build', 'brew-build']`
		`+ and 'item' in subject`
		`+ and isinstance(subject['item'], str)):`
		`return ('koji_build', subject['item'])`
		`elif 'original_spec_nvr' in subject and isinstance(subject['original_spec_nvr'], str):`
		`return ('koji_build', subject['original_spec_nvr'])`

rayson commented 5 years ago

After upgrading C3I Jenkins slave pod from Fedora 28 to 29,
C3I pipeline builds for waiverdb fails with a Flake8 warning:
W504 line break after binary operator.

This happens because of a updated PEP 8 rule, which
recommends that line breaks should occur before the binary operator
because it keeps all operators aligned.
However both W503 and W504 are enforced when all warnings are configured.

This pull-request eliminates the warning by following the new rule and ignoring W503.

rayson commented 5 years ago

@lholecek @ralph Can you take a look?