pylint: Ignore usage of 'unicode' before assignment

New versions of pylint ignore Python 2 functions and types, evaluating
'unicode' as "undefined". ansible-freeipa will always define 'unicode'
when running under Python 3, and it is always defined under Python 2.

This patch fixes these false positives.
This commit is contained in:
Rafael Guterres Jeffman
2024-05-22 10:04:22 -03:00
parent 60905ef5bf
commit f53ca3ad39
8 changed files with 13 additions and 8 deletions

View File

@@ -487,7 +487,10 @@ def module_params_get(module, name, allow_empty_list_item=False):
# Ansible issue https://github.com/ansible/ansible/issues/77108 # Ansible issue https://github.com/ansible/ansible/issues/77108
if isinstance(value, list): if isinstance(value, list):
for val in value: 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: if not allow_empty_list_item:
module.fail_json( module.fail_json(
msg="Parameter '%s' contains an empty string" % msg="Parameter '%s' contains an empty string" %

View File

@@ -663,7 +663,9 @@ def main():
check_parameters(ansible_module, state, action) check_parameters(ansible_module, state, action)
elif isinstance(group_name, (str, unicode)): elif (
isinstance(group_name, (str, unicode)) # pylint: disable=E0606
):
name = group_name name = group_name
else: else:
ansible_module.fail_json(msg="Group '%s' is not valid" % ansible_module.fail_json(msg="Group '%s' is not valid" %

View File

@@ -988,7 +988,7 @@ def main():
sshpubkey = [str(normalize_sshpubkey(key)) for sshpubkey = [str(normalize_sshpubkey(key)) for
key in sshpubkey] key in sshpubkey]
elif isinstance(host, (str, unicode)): elif isinstance(host, (str, unicode)): # pylint: disable=E0606
name = host name = host
else: else:
ansible_module.fail_json(msg="Host '%s' is not valid" % ansible_module.fail_json(msg="Host '%s' is not valid" %

View File

@@ -293,7 +293,7 @@ def result_get_value_lowercase(res_find, key, default=None):
if existing is not None: if existing is not None:
if isinstance(existing, (list, tuple)): if isinstance(existing, (list, tuple)):
existing = [to_text(item).lower() for item in existing] 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() existing = existing.lower()
else: else:
existing = default existing = default

View File

@@ -693,7 +693,7 @@ def main():
delete_continue = service.get("delete_continue") delete_continue = service.get("delete_continue")
elif isinstance(service, (str, unicode)): elif isinstance(service, (str, unicode)): # pylint: disable=E0606
name = service name = service
else: else:
ansible_module.fail_json(msg="Service '%s' is not valid" % ansible_module.fail_json(msg="Service '%s' is not valid" %

View File

@@ -1382,7 +1382,7 @@ def main():
email = extend_emails(email, default_email_domain) email = extend_emails(email, default_email_domain)
elif isinstance(user, (str, unicode)): elif isinstance(user, (str, unicode)): # pylint: disable=E0606
name = user name = user
else: else:
ansible_module.fail_json(msg="User '%s' is not valid" % ansible_module.fail_json(msg="User '%s' is not valid" %

View File

@@ -139,7 +139,7 @@ def main():
conn.connect(ccache=installer._ccache) conn.connect(ccache=installer._ccache)
remote_api.Command['hostgroup_add_member']( remote_api.Command['hostgroup_add_member'](
u'ipaservers', u'ipaservers',
host=[unicode(api.env.host)], host=[unicode(api.env.host)], # pylint: disable=E0606
) )
finally: finally:
if conn.isconnected(): if conn.isconnected():

View File

@@ -658,7 +658,7 @@ def main():
# Check authorization # Check authorization
result = remote_api.Command['hostgroup_find']( result = remote_api.Command['hostgroup_find'](
cn=u'ipaservers', cn=u'ipaservers',
host=[unicode(api.env.host)] host=[unicode(api.env.host)] # pylint: disable=E0606
)['result'] )['result']
add_to_ipaservers = not result add_to_ipaservers = not result