diff --git a/plugins/module_utils/ansible_freeipa_module.py b/plugins/module_utils/ansible_freeipa_module.py index 16b4fa810e00bb78ef37428010adc63725a6eff6..8675beee9a8d3bf7bfbb7ab3aceef5c2fb4e5be4 100644 --- a/plugins/module_utils/ansible_freeipa_module.py +++ b/plugins/module_utils/ansible_freeipa_module.py @@ -487,7 +487,10 @@ def module_params_get(module, name, allow_empty_list_item=False): # Ansible issue https://github.com/ansible/ansible/issues/77108 if isinstance(value, list): for val in value: - if isinstance(val, (str, unicode)) and not val: + if ( + isinstance(val, (str, unicode)) # pylint: disable=E0606 + and not val + ): if not allow_empty_list_item: module.fail_json( msg="Parameter '%s' contains an empty string" % diff --git a/plugins/modules/ipagroup.py b/plugins/modules/ipagroup.py index dcb1f3a36120712f3f686cff15087ec995a3f2e7..1ffdef9deb62e189a1b0955df6df4bcce88fae4a 100644 --- a/plugins/modules/ipagroup.py +++ b/plugins/modules/ipagroup.py @@ -663,7 +663,9 @@ def main(): check_parameters(ansible_module, state, action) - elif isinstance(group_name, (str, unicode)): + elif ( + isinstance(group_name, (str, unicode)) # pylint: disable=E0606 + ): name = group_name else: ansible_module.fail_json(msg="Group '%s' is not valid" % diff --git a/plugins/modules/ipahost.py b/plugins/modules/ipahost.py index a1d2142365acbc514cfd1bbac634193334bd9dd1..86336c46132a4d2da4b1f3c12a70e9eff2fec7d4 100644 --- a/plugins/modules/ipahost.py +++ b/plugins/modules/ipahost.py @@ -988,7 +988,7 @@ def main(): sshpubkey = [str(normalize_sshpubkey(key)) for key in sshpubkey] - elif isinstance(host, (str, unicode)): + elif isinstance(host, (str, unicode)): # pylint: disable=E0606 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 2e876268026e9ae11e8a6eda293cc166cd4bd504..25017e76696bdecd41fc1703e9132b7920d09cfc 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)): + if isinstance(existing, (str, unicode)): # pylint: disable=E0606 existing = existing.lower() else: existing = default diff --git a/plugins/modules/ipaservice.py b/plugins/modules/ipaservice.py index 1a4fd7146c9891c9fee203bbc3d520aeb04d6b03..8326d4228a2e771a00ebf25f602d0f65d88ff239 100644 --- a/plugins/modules/ipaservice.py +++ b/plugins/modules/ipaservice.py @@ -693,7 +693,7 @@ def main(): delete_continue = service.get("delete_continue") - elif isinstance(service, (str, unicode)): + elif isinstance(service, (str, unicode)): # pylint: disable=E0606 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 8c8bb436c34949a6f718aef953c5d41bb4442fea..d7c18082d7056d00f888b1f610fa1525e29e97a8 100644 --- a/plugins/modules/ipauser.py +++ b/plugins/modules/ipauser.py @@ -1382,7 +1382,7 @@ def main(): email = extend_emails(email, default_email_domain) - elif isinstance(user, (str, unicode)): + elif isinstance(user, (str, unicode)): # pylint: disable=E0606 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 66c1615b1768eb3eef7379f48b82aa618e1e1a42..6fb8b1f92162e6fe07bf3e771e0d71cf6bae790f 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)], + host=[unicode(api.env.host)], # pylint: disable=E0606 ) finally: if conn.isconnected(): diff --git a/roles/ipareplica/library/ipareplica_prepare.py b/roles/ipareplica/library/ipareplica_prepare.py index 962432407259695bca239fb4e1bcc65bc3a0d734..5d9fd2d54614c3a97861a2dc638a21cf0efa04e2 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)] + host=[unicode(api.env.host)] # pylint: disable=E0606 )['result'] add_to_ipaservers = not result