Skip to content

Commit

Permalink
cephadm: line break after binary operator (W504)
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Fritch <[email protected]>
  • Loading branch information
mgfritch committed Mar 3, 2021
1 parent 06e02b7 commit 7ac0479
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
11 changes: 5 additions & 6 deletions src/cephadm/cephadm
Original file line number Diff line number Diff line change
Expand Up @@ -5224,17 +5224,17 @@ def command_rm_cluster(ctx):
verbosity=CallVerbosity.DEBUG)

# rm units
call_throws(ctx, ['rm', '-f', ctx.unit_dir +
call_throws(ctx, ['rm', '-f', ctx.unit_dir + # noqa: W504
'/ceph-%[email protected]' % ctx.fsid])
call_throws(ctx, ['rm', '-f', ctx.unit_dir +
call_throws(ctx, ['rm', '-f', ctx.unit_dir + # noqa: W504
'/ceph-%s.target' % ctx.fsid])
call_throws(ctx, ['rm', '-rf',
ctx.unit_dir + '/ceph-%s.target.wants' % ctx.fsid])
# rm data
call_throws(ctx, ['rm', '-rf', ctx.data_dir + '/' + ctx.fsid])
# rm logs
call_throws(ctx, ['rm', '-rf', ctx.log_dir + '/' + ctx.fsid])
call_throws(ctx, ['rm', '-rf', ctx.log_dir +
call_throws(ctx, ['rm', '-rf', ctx.log_dir + # noqa: W504
'/*.wants/ceph-%s@*' % ctx.fsid])
# rm logrotate config
call_throws(ctx, ['rm', '-f', ctx.logrotate_dir + '/ceph-%s' % ctx.fsid])
Expand Down Expand Up @@ -6409,9 +6409,8 @@ class HostFacts():
"""Return the attributes of this HostFacts object as json"""
data = {
k: getattr(self, k) for k in dir(self)
if not k.startswith('_') and
isinstance(getattr(self, k),
(float, int, str, list, dict, tuple))
if not k.startswith('_')
and isinstance(getattr(self, k), (float, int, str, list, dict, tuple))
}
return json.dumps(data, indent=2, sort_keys=True)

Expand Down
1 change: 0 additions & 1 deletion src/cephadm/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ max-line-length = 100
ignore =
E501,
W503,
W504,
exclude =
.tox,
.vagrant,
Expand Down

0 comments on commit 7ac0479

Please sign in to comment.