internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-31 20:04:45 +00:00
Code Issues Projects Releases Wiki Activity

Fix or disable pylint's no-else-return.

Browse Source 
Fixed usage of `else` right after return, or disable pylint
evaluation when it would play against code readability.
This commit is contained in:
Rafael Guterres Jeffman
2021-04-29 18:46:13 -03:00
parent 07abd6c12e
commit 43c4a6d91f
5 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/module_utils/ansible_freeipa_module.py
View File

@@ -315,7 +315,7 @@ else:
filtered_args = [key for key in args if key not in ignore] filtered_args = [key for key in args if key not in ignore]
for key in filtered_args: for key in filtered_args:
if key not in ipa: if key not in ipa: # pylint: disable=no-else-return
module.debug( module.debug(
base_debug_msg + "Command key not present in IPA: %s" % key base_debug_msg + "Command key not present in IPA: %s" % key
) )
@@ -367,15 +367,13 @@ else:
if value is not None: if value is not None:
if isinstance(value, list): if isinstance(value, list):
return [_afm_convert(x) for x in value] return [_afm_convert(x) for x in value]
elif isinstance(value, dict): if isinstance(value, dict):
return {_afm_convert(k): _afm_convert(v) return {_afm_convert(k): _afm_convert(v)
for k, v in value.items()} for k, v in value.items()}
elif isinstance(value, str): if isinstance(value, str):
return to_text(value) return to_text(value)
else:
return value return value
else:
return value
def module_params_get(module, name): def module_params_get(module, name):
return _afm_convert(module.params.get(name)) return _afm_convert(module.params.get(name))
@@ -465,11 +463,10 @@ else:
def DN_x500_text(text): # pylint: disable=invalid-name def DN_x500_text(text): # pylint: disable=invalid-name
if hasattr(DN, "x500_text"): if hasattr(DN, "x500_text"):
return DN(text).x500_text() return DN(text).x500_text()
else: # Emulate x500_text
# Emulate x500_text dn = DN(text)
dn = DN(text) dn.rdns = reversed(dn.rdns)
dn.rdns = reversed(dn.rdns) return str(dn)
return str(dn)
def is_valid_port(port): def is_valid_port(port):
if not isinstance(port, int): if not isinstance(port, int):

4
plugins/modules/ipadnsconfig.py
View File

@@ -114,8 +114,8 @@ def find_dnsconfig(module):
if _result["result"].get('idnsforwarders', None) is None: if _result["result"].get('idnsforwarders', None) is None:
_result["result"]['idnsforwarders'] = [''] _result["result"]['idnsforwarders'] = ['']
return _result["result"] return _result["result"]
else:
module.fail_json(msg="Could not retrieve current DNS configuration.") module.fail_json(msg="Could not retrieve current DNS configuration.")
return None return None

5
plugins/modules/ipadnszone.py
View File

@@ -404,10 +404,9 @@ class DNSZoneModule(FreeIPABaseModule):
ip_version = ip.version ip_version = ip.version
if ip_version == 4: if ip_version == 4:
return u'.'.join(items[4 - prefixlen // 8:]) return u'.'.join(items[4 - prefixlen // 8:])
elif ip_version == 6: if ip_version == 6:
return u'.'.join(items[32 - prefixlen // 4:]) return u'.'.join(items[32 - prefixlen // 4:])
else: self.fail_json(msg="Invalid IP version for reverse zone.")
self.fail_json(msg="Invalid IP version for reverse zone.")
def get_zone(self, zone_name): def get_zone(self, zone_name):
get_zone_args = {"idnsname": zone_name, "all": True} get_zone_args = {"idnsname": zone_name, "all": True}

2
plugins/modules/ipahbacsvcgroup.py
View File

@@ -121,7 +121,7 @@ def find_hbacsvcgroup(module, name):
msg="There is more than one hbacsvcgroup '%s'" % (name)) msg="There is more than one hbacsvcgroup '%s'" % (name))
elif len(_result["result"]) == 1: elif len(_result["result"]) == 1:
return _result["result"][0] return _result["result"][0]
return None return None

4
plugins/modules/ipaservice.py
View File

@@ -250,8 +250,8 @@ def find_service(module, name):
_res["usercertificate"] = [encode_certificate(cert) for _res["usercertificate"] = [encode_certificate(cert) for
cert in certs] cert in certs]
return _res return _res
else:
return None return None
def gen_args(pac_type, auth_ind, skip_host_check, force, requires_pre_auth, def gen_args(pac_type, auth_ind, skip_host_check, force, requires_pre_auth,