Skip to content
Snippets Groups Projects
Commit 43c4a6d9 authored by Rafael Guterres Jeffman's avatar Rafael Guterres Jeffman
Browse files

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

Fixed usage of `else` right after return, or disable pylint
evaluation when it would play against code readability.
parent 07abd6c1
Branches
No related tags found
No related merge requests found
...@@ -315,7 +315,7 @@ else: ...@@ -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,14 +367,12 @@ else: ...@@ -367,14 +367,12 @@ 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
else:
return value return value
def module_params_get(module, name): def module_params_get(module, name):
...@@ -465,7 +463,6 @@ else: ...@@ -465,7 +463,6 @@ 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)
......
...@@ -114,7 +114,7 @@ def find_dnsconfig(module): ...@@ -114,7 +114,7 @@ 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
......
...@@ -404,9 +404,8 @@ class DNSZoneModule(FreeIPABaseModule): ...@@ -404,9 +404,8 @@ 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):
......
...@@ -250,7 +250,7 @@ def find_service(module, name): ...@@ -250,7 +250,7 @@ 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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment