diff --git a/plugins/module_utils/ansible_freeipa_module.py b/plugins/module_utils/ansible_freeipa_module.py index 8675beee9a..8545338689 100644 --- a/plugins/module_utils/ansible_freeipa_module.py +++ b/plugins/module_utils/ansible_freeipa_module.py @@ -488,7 +488,7 @@ def module_params_get(module, name, allow_empty_list_item=False): if isinstance(value, list): for val in value: if ( - isinstance(val, (str, unicode)) # pylint: disable=E0606 + isinstance(val, (str, unicode)) # pylint: disable=E0606,W0012 and not val ): if not allow_empty_list_item: diff --git a/plugins/modules/ipagroup.py b/plugins/modules/ipagroup.py index 1ffdef9deb..919a68e4dd 100644 --- a/plugins/modules/ipagroup.py +++ b/plugins/modules/ipagroup.py @@ -664,7 +664,9 @@ def main(): check_parameters(ansible_module, state, action) elif ( - isinstance(group_name, (str, unicode)) # pylint: disable=E0606 + isinstance( + group_name, (str, unicode) # pylint: disable=E0606,W0012 + ) ): name = group_name else: diff --git a/plugins/modules/ipahost.py b/plugins/modules/ipahost.py index 86336c4613..a8464df074 100644 --- a/plugins/modules/ipahost.py +++ b/plugins/modules/ipahost.py @@ -988,7 +988,9 @@ def main(): sshpubkey = [str(normalize_sshpubkey(key)) for key in sshpubkey] - elif isinstance(host, (str, unicode)): # pylint: disable=E0606 + elif ( + isinstance(host, (str, unicode)) # pylint: disable=E0606,W0012 + ): name = host else: ansible_module.fail_json(msg="Host '%s' is not valid" % diff --git a/plugins/modules/iparole.py b/plugins/modules/iparole.py index 25017e7669..eaa358e0f8 100644 --- a/plugins/modules/iparole.py +++ b/plugins/modules/iparole.py @@ -293,7 +293,7 @@ def result_get_value_lowercase(res_find, key, default=None): if existing is not None: if isinstance(existing, (list, tuple)): existing = [to_text(item).lower() for item in existing] - if isinstance(existing, (str, unicode)): # pylint: disable=E0606 + if isinstance(existing, (str, unicode)): # pylint: disable=E0606,W0012 existing = existing.lower() else: existing = default diff --git a/plugins/modules/ipaservice.py b/plugins/modules/ipaservice.py index 8326d4228a..2c2057e1ee 100644 --- a/plugins/modules/ipaservice.py +++ b/plugins/modules/ipaservice.py @@ -693,7 +693,11 @@ def main(): delete_continue = service.get("delete_continue") - elif isinstance(service, (str, unicode)): # pylint: disable=E0606 + elif ( + isinstance( + service, (str, unicode) # pylint: disable=E0606,W0012 + ) + ): name = service else: ansible_module.fail_json(msg="Service '%s' is not valid" % diff --git a/plugins/modules/ipauser.py b/plugins/modules/ipauser.py index d7c18082d7..869d254126 100644 --- a/plugins/modules/ipauser.py +++ b/plugins/modules/ipauser.py @@ -1382,7 +1382,11 @@ def main(): email = extend_emails(email, default_email_domain) - elif isinstance(user, (str, unicode)): # pylint: disable=E0606 + elif ( + isinstance( + user, (str, unicode) # pylint: disable=E0606,W0012 + ) + ): name = user else: ansible_module.fail_json(msg="User '%s' is not valid" % diff --git a/roles/ipareplica/library/ipareplica_add_to_ipaservers.py b/roles/ipareplica/library/ipareplica_add_to_ipaservers.py index 6fb8b1f921..a041ac3354 100644 --- a/roles/ipareplica/library/ipareplica_add_to_ipaservers.py +++ b/roles/ipareplica/library/ipareplica_add_to_ipaservers.py @@ -139,7 +139,7 @@ def main(): conn.connect(ccache=installer._ccache) remote_api.Command['hostgroup_add_member']( u'ipaservers', - host=[unicode(api.env.host)], # pylint: disable=E0606 + host=[unicode(api.env.host)], # pylint: disable=E0606,W0012 ) finally: if conn.isconnected(): diff --git a/roles/ipareplica/library/ipareplica_prepare.py b/roles/ipareplica/library/ipareplica_prepare.py index 5d9fd2d546..f8d196126a 100644 --- a/roles/ipareplica/library/ipareplica_prepare.py +++ b/roles/ipareplica/library/ipareplica_prepare.py @@ -658,7 +658,7 @@ def main(): # Check authorization result = remote_api.Command['hostgroup_find']( cn=u'ipaservers', - host=[unicode(api.env.host)] # pylint: disable=E0606 + host=[unicode(api.env.host)] # pylint: disable=E0606,W0012 )['result'] add_to_ipaservers = not result