diff --git a/plugins/modules/ipahost.py b/plugins/modules/ipahost.py index fa068ddc4d105e7e391cc0534e15527a1e23858d..7800b8c3c988aacf14f766bd3e760f8b60090a7e 100644 --- a/plugins/modules/ipahost.py +++ b/plugins/modules/ipahost.py @@ -439,7 +439,7 @@ def find_dnsrecord(module, name): This function may raise ipalib_errors.NotFound in some cases, and it should be handled by the caller. """ - domain_name = name[name.find(".")+1:] + domain_name = name[name.find(".") + 1:] host_name = name[:name.find(".")] _args = { @@ -1231,7 +1231,7 @@ def main(): }]) if len(dnsrecord_a_add) > 0 or len(dnsrecord_aaaa_add) > 0: - domain_name = name[name.find(".")+1:] + domain_name = name[name.find(".") + 1:] host_name = name[:name.find(".")] _args = {"idnsname": host_name} @@ -1248,7 +1248,7 @@ def main(): "dnsrecord_add", _args]) if len(dnsrecord_a_del) > 0 or len(dnsrecord_aaaa_del) > 0: - domain_name = name[name.find(".")+1:] + domain_name = name[name.find(".") + 1:] host_name = name[:name.find(".")] # There seems to be an issue with dnsrecord_del (not @@ -1364,7 +1364,7 @@ def main(): if "arecord" in dnsrecord_args or \ "aaaarecord" in dnsrecord_args: - domain_name = name[name.find(".")+1:] + domain_name = name[name.find(".") + 1:] host_name = name[:name.find(".")] dnsrecord_args["idnsname"] = host_name diff --git a/plugins/modules/ipauser.py b/plugins/modules/ipauser.py index 3610c31700c95a9699ab5047fb41d522de145745..887b5c57747b13066f1d125df79378e01d3cbd57 100644 --- a/plugins/modules/ipauser.py +++ b/plugins/modules/ipauser.py @@ -699,8 +699,8 @@ def check_certmapdata(data): i = data.find("<I>", 4) s = data.find("<S>", i) # pylint: disable=invalid-name - issuer = data[i+3:s] - subject = data[s+3:] + issuer = data[i + 3:s] + subject = data[s + 3:] if i < 0 or s < 0 or "CN" not in issuer or "CN" not in subject: return False diff --git a/roles/ipaclient/library/ipaclient_join.py b/roles/ipaclient/library/ipaclient_join.py index 19a8c7a3df4d863514e16f7ef11d11358195a387..2c72a6a6473204e916ea7abc3593f82c9f62152b 100644 --- a/roles/ipaclient/library/ipaclient_join.py +++ b/roles/ipaclient/library/ipaclient_join.py @@ -182,7 +182,7 @@ def main(): if password is None and admin_keytab is None: module.fail_json(msg="Password or admin_keytab is needed") - client_domain = hostname[hostname.find(".")+1:] + client_domain = hostname[hostname.find(".") + 1:] nolog = tuple() env = {'PATH': SECURE_PATH} fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE) diff --git a/roles/ipaclient/library/ipaclient_setup_sssd.py b/roles/ipaclient/library/ipaclient_setup_sssd.py index b26e60a0a115df923f10108cb148e96c5d61d032..5d2f520cd14dbc5a53ec2ab1a293455523c11607 100644 --- a/roles/ipaclient/library/ipaclient_setup_sssd.py +++ b/roles/ipaclient/library/ipaclient_setup_sssd.py @@ -159,7 +159,7 @@ def main(): options.krb5_offline_passwords = not options.no_krb5_offline_passwords fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE) - client_domain = hostname[hostname.find(".")+1:] + client_domain = hostname[hostname.find(".") + 1:] if configure_sssd_conf(fstore, cli_realm, cli_domain, cli_server, options, client_domain, hostname): diff --git a/roles/ipaclient/library/ipaclient_test.py b/roles/ipaclient/library/ipaclient_test.py index f7114865139ff27ddf8c106add2c147861e5fa33..6677d837cd6cc5cc8d65b335deca17eebbcded5a 100644 --- a/roles/ipaclient/library/ipaclient_test.py +++ b/roles/ipaclient/library/ipaclient_test.py @@ -322,7 +322,7 @@ def main(): if options.domain_name is None and options.servers is not None: if len(options.servers) > 0: options.domain_name = options.servers[0][ - options.servers[0].find(".")+1:] + options.servers[0].find(".") + 1:] try: self = options @@ -704,7 +704,7 @@ def main(): cli_domain_source = ds.domain_source logger.debug("will use discovered domain: %s", cli_domain) - client_domain = hostname[hostname.find(".")+1:] + client_domain = hostname[hostname.find(".") + 1:] if ret in (ipadiscovery.NO_LDAP_SERVER, ipadiscovery.NOT_IPA_SERVER) \ or not ds.server: diff --git a/roles/ipaclient/library/ipaclient_test_keytab.py b/roles/ipaclient/library/ipaclient_test_keytab.py index e32de743b11f2f1f1d28b4aad1cfde0d79382d9d..97a1ab798afd783e639f1bee8ca16e67ee8759c6 100644 --- a/roles/ipaclient/library/ipaclient_test_keytab.py +++ b/roles/ipaclient/library/ipaclient_test_keytab.py @@ -134,7 +134,7 @@ def main(): kdc = module.params.get('kdc') kinit_attempts = module.params.get('kinit_attempts') - client_domain = hostname[hostname.find(".")+1:] + client_domain = hostname[hostname.find(".") + 1:] host_principal = 'host/%s@%s' % (hostname, realm) sssd = True diff --git a/roles/ipaclient/module_utils/ansible_ipa_client.py b/roles/ipaclient/module_utils/ansible_ipa_client.py index a4b0b6f6a496f2a99d648539e8457db9abd48160..8826b6d45023b5f10c0f7791cfa1eafb4edd7ea8 100644 --- a/roles/ipaclient/module_utils/ansible_ipa_client.py +++ b/roles/ipaclient/module_utils/ansible_ipa_client.py @@ -63,7 +63,7 @@ else: # See ipapython/version.py IPA_MAJOR, IPA_MINOR, IPA_RELEASE = [int(x) for x in VERSION.split(".", 2)] - IPA_PYTHON_VERSION = IPA_MAJOR*10000 + IPA_MINOR*100 + IPA_RELEASE + IPA_PYTHON_VERSION = IPA_MAJOR * 10000 + IPA_MINOR * 100 + IPA_RELEASE else: IPA_PYTHON_VERSION = NUM_VERSION diff --git a/roles/ipareplica/library/ipareplica_test.py b/roles/ipareplica/library/ipareplica_test.py index 5ddfde7fdce6db4f12c60c2cca316179c016e5ae..784136d2fd3a6d74a44fbd6c074b0f82a0b4c8ff 100644 --- a/roles/ipareplica/library/ipareplica_test.py +++ b/roles/ipareplica/library/ipareplica_test.py @@ -252,7 +252,8 @@ def main(): # If not defined, set domain from server name if installer.domain_name is None and installer.server is not None: - installer.domain_name = installer.server[installer.server.find(".")+1:] + installer.domain_name = \ + installer.server[installer.server.find(".") + 1:] # If not defined, set realm from domain name if installer.realm_name is None and installer.domain_name is not None: installer.realm_name = installer.domain_name.upper() diff --git a/roles/ipareplica/module_utils/ansible_ipa_replica.py b/roles/ipareplica/module_utils/ansible_ipa_replica.py index 1d70af00a3bbe03fda713842e010c9d25ddd5c96..464a43fcc3c7b53ede76653a44f39f173ee1aa4b 100644 --- a/roles/ipareplica/module_utils/ansible_ipa_replica.py +++ b/roles/ipareplica/module_utils/ansible_ipa_replica.py @@ -65,7 +65,7 @@ else: # See ipapython/version.py IPA_MAJOR, IPA_MINOR, IPA_RELEASE = [int(x) for x in VERSION.split(".", 2)] - IPA_PYTHON_VERSION = IPA_MAJOR*10000 + IPA_MINOR*100 + IPA_RELEASE + IPA_PYTHON_VERSION = IPA_MAJOR * 10000 + IPA_MINOR * 100 + IPA_RELEASE else: IPA_PYTHON_VERSION = NUM_VERSION diff --git a/roles/ipaserver/library/ipaserver_test.py b/roles/ipaserver/library/ipaserver_test.py index 3a50c8d6940284e2ce169935709c1bc0f88aa703..4e2df5caa48720ba824ed1e2a87fb088848b7b0f 100644 --- a/roles/ipaserver/library/ipaserver_test.py +++ b/roles/ipaserver/library/ipaserver_test.py @@ -926,7 +926,7 @@ def main(): host_name = host_name.lower() if not options.domain_name: - domain_name = host_name[host_name.find(".")+1:] + domain_name = host_name[host_name.find(".") + 1:] try: validate_domain_name(domain_name) except ValueError as e: diff --git a/roles/ipaserver/module_utils/ansible_ipa_server.py b/roles/ipaserver/module_utils/ansible_ipa_server.py index d6bdb6aec56bb1bc796e351643e3487f5341b60e..2cd677fc34097a3ad9fc412dac68f365f3a9e836 100644 --- a/roles/ipaserver/module_utils/ansible_ipa_server.py +++ b/roles/ipaserver/module_utils/ansible_ipa_server.py @@ -64,7 +64,7 @@ else: # See ipapython/version.py IPA_MAJOR, IPA_MINOR, IPA_RELEASE = [int(x) for x in VERSION.split(".", 2)] - IPA_PYTHON_VERSION = IPA_MAJOR*10000 + IPA_MINOR*100 + IPA_RELEASE + IPA_PYTHON_VERSION = IPA_MAJOR * 10000 + IPA_MINOR * 100 + IPA_RELEASE else: IPA_PYTHON_VERSION = NUM_VERSION diff --git a/utils/gen_module_docs.py b/utils/gen_module_docs.py index 4994a3466b058b2eb09fac0ed1a9a07ca94aa74b..b3ac9f57e38b6f8af60e81d48f20d9010f361a9f 100644 --- a/utils/gen_module_docs.py +++ b/utils/gen_module_docs.py @@ -206,7 +206,7 @@ def gen_module_docs(module_in): # print("%s: Bad argument dict line '%s'" % (module_in, # stripped)) while ")," not in stripped and i < len(in_lines) - 1: - next_stripped = in_lines[i+1].strip() + next_stripped = in_lines[i + 1].strip() if not next_stripped.startswith("# "): stripped += next_stripped i += 1