Skip to content

Commit

Permalink
pylint: Ignore usage of 'unicode' before assignment
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
rjeffman committed May 22, 2024
1 parent 60905ef commit f53ca3a
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 8 deletions.
5 changes: 4 additions & 1 deletion plugins/module_utils/ansible_freeipa_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -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" %
Expand Down
4 changes: 3 additions & 1 deletion plugins/modules/ipagroup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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" %
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/ipahost.py
Original file line number Diff line number Diff line change
Expand Up @@ -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" %
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/iparole.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/ipaservice.py
Original file line number Diff line number Diff line change
Expand Up @@ -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" %
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/ipauser.py
Original file line number Diff line number Diff line change
Expand Up @@ -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" %
Expand Down
2 changes: 1 addition & 1 deletion roles/ipareplica/library/ipareplica_add_to_ipaservers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
2 changes: 1 addition & 1 deletion roles/ipareplica/library/ipareplica_prepare.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit f53ca3a

Please sign in to comment.