From: Michael Fritch <mfritch@suse.com>
Date: Wed, 17 Feb 2021 03:56:03 +0000 (-0700)
Subject: cephadm: missing whitespace around arithmetic operator (E226)
X-Git-Tag: v16.2.0~106^2~136
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a50ecf49c535eb27f1e4cf6447bae052909a6395;p=ceph.git

cephadm: missing whitespace around arithmetic operator (E226)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 549258b4c6fe3945acdd03eeedab5070d1d81d01)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 26e095d800bd..cf64ef26c106 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -3323,7 +3323,7 @@ def prepare_mon_addresses(
                 logger.warning('Using msgr2 protocol for unrecognized port %d' %
                                port)
                 addr_arg = '[v2:%s]' % ctx.mon_ip
-            base_ip = ctx.mon_ip[0:-(len(str(port)))-1]
+            base_ip = ctx.mon_ip[0:-(len(str(port))) - 1]
             check_ip_port(ctx, base_ip, port)
         else:
             base_ip = ctx.mon_ip
@@ -3344,7 +3344,7 @@ def prepare_mon_addresses(
             port = int(hasport[0])
             # strip off v1: or v2: prefix
             addr = re.sub(r'^\w+:', '', addr)
-            base_ip = addr[0:-(len(str(port)))-1]
+            base_ip = addr[0:-(len(str(port))) - 1]
             check_ip_port(ctx, base_ip, port)
     else:
         raise Error('must specify --mon-ip or --mon-addrv')
@@ -3634,7 +3634,7 @@ def prepare_ssh(
             with open(auth_keys_file, 'r') as f:
                 f.seek(0, os.SEEK_END)
                 if f.tell() > 0:
-                    f.seek(f.tell()-1, os.SEEK_SET) # go to last char
+                    f.seek(f.tell() - 1, os.SEEK_SET) # go to last char
                     if f.read() != '\n':
                         add_newline = True
 
@@ -5890,7 +5890,7 @@ def get_ipv6_address(ifname):
         field = iface_setting.split()
         if field[-1] == ifname:
             ipv6_raw = field[0]
-            ipv6_fmtd = ":".join([ipv6_raw[_p:_p+4] for _p in range(0, len(field[0]),4)])
+            ipv6_fmtd = ":".join([ipv6_raw[_p:_p + 4] for _p in range(0, len(field[0]),4)])
             # apply naming rules using ipaddress module
             ipv6 = ipaddress.ip_address(ipv6_fmtd)
             return "{}/{}".format(str(ipv6), int('0x{}'.format(field[2]), 16))
diff --git a/src/cephadm/tox.ini b/src/cephadm/tox.ini
index fbd078997946..21d287c7f6fd 100644
--- a/src/cephadm/tox.ini
+++ b/src/cephadm/tox.ini
@@ -5,7 +5,6 @@ skipsdist=true
 [flake8]
 max-line-length = 100
 ignore =
-    E226,
     E231,
     E241,
     E251,