From d166b4e1c0dc6c995f302529ff5cd294d3edbe49 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 15 Mar 2021 16:41:48 -0500 Subject: [PATCH] cephadm: too many leading '#' for block comment (E266) Signed-off-by: Michael Fritch (cherry picked from commit 3dcb56e3e31d11041a48c2749bb248240bb14134) # Conflicts: # src/cephadm/cephadm - whitespacea roudn comment --- src/cephadm/cephadm | 11 ++++------- src/cephadm/tox.ini | 1 - 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index beb313e84bc..7b008a9b4c9 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -164,9 +164,6 @@ class CephadmContext: super().__setattr__(name, value) -################################## - - # Log and console output config logging_config = { 'version': 1, @@ -1875,7 +1872,7 @@ def move_files(ctx, src, dst, uid=None, gid=None): os.chown(dst_file, uid, gid) -## copied from distutils ## +# copied from distutils def find_executable(executable, path=None): """Tries to find 'executable' in the directories listed in 'path'. A string listing directories separated by 'os.pathsep'; defaults to @@ -4425,9 +4422,9 @@ def command_logs(ctx): def list_networks(ctx): # type: (CephadmContext) -> Dict[str,List[str]] - ## sadly, 18.04's iproute2 4.15.0-2ubun doesn't support the -j flag, - ## so we'll need to use a regex to parse 'ip' command output. - ## + # sadly, 18.04's iproute2 4.15.0-2ubun doesn't support the -j flag, + # so we'll need to use a regex to parse 'ip' command output. + # # out, _, _ = call_throws(['ip', '-j', 'route', 'ls']) # j = json.loads(out) # for x in j: diff --git a/src/cephadm/tox.ini b/src/cephadm/tox.ini index 18ce529d341..6ec9f7b8c93 100644 --- a/src/cephadm/tox.ini +++ b/src/cephadm/tox.ini @@ -5,7 +5,6 @@ skipsdist=true [flake8] max-line-length = 100 ignore = - E266, E301, E302, E303, -- 2.47.3