From 43c4a6d91fab31c9f665d60a391e70d11ce6048d Mon Sep 17 00:00:00 2001
From: Rafael Guterres Jeffman <rjeffman@redhat.com>
Date: Thu, 29 Apr 2021 18:46:13 -0300
Subject: [PATCH] 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.
---
.../module_utils/ansible_freeipa_module.py | 21 ++++++++-----------
plugins/modules/ipadnsconfig.py | 4 ++--
plugins/modules/ipadnszone.py | 5 ++---
plugins/modules/ipahbacsvcgroup.py | 2 +-
plugins/modules/ipaservice.py | 4 ++--
5 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/plugins/module_utils/ansible_freeipa_module.py b/plugins/module_utils/ansible_freeipa_module.py
index a1f14020..3dffd44a 100644
--- a/plugins/module_utils/ansible_freeipa_module.py
+++ b/plugins/module_utils/ansible_freeipa_module.py
@@ -315,7 +315,7 @@ else:
filtered_args = [key for key in args if key not in ignore]
for key in filtered_args:
- if key not in ipa:
+ if key not in ipa: # pylint: disable=no-else-return
module.debug(
base_debug_msg + "Command key not present in IPA: %s" % key
)
@@ -367,15 +367,13 @@ else:
if value is not None:
if isinstance(value, list):
return [_afm_convert(x) for x in value]
- elif isinstance(value, dict):
+ if isinstance(value, dict):
return {_afm_convert(k): _afm_convert(v)
for k, v in value.items()}
- elif isinstance(value, str):
+ if isinstance(value, str):
return to_text(value)
- else:
- return value
- else:
- return value
+
+ return value
def module_params_get(module, name):
return _afm_convert(module.params.get(name))
@@ -465,11 +463,10 @@ else:
def DN_x500_text(text): # pylint: disable=invalid-name
if hasattr(DN, "x500_text"):
return DN(text).x500_text()
- else:
- # Emulate x500_text
- dn = DN(text)
- dn.rdns = reversed(dn.rdns)
- return str(dn)
+ # Emulate x500_text
+ dn = DN(text)
+ dn.rdns = reversed(dn.rdns)
+ return str(dn)
def is_valid_port(port):
if not isinstance(port, int):
diff --git a/plugins/modules/ipadnsconfig.py b/plugins/modules/ipadnsconfig.py
index a0f2bc56..8d705807 100644
--- a/plugins/modules/ipadnsconfig.py
+++ b/plugins/modules/ipadnsconfig.py
@@ -114,8 +114,8 @@ def find_dnsconfig(module):
if _result["result"].get('idnsforwarders', None) is None:
_result["result"]['idnsforwarders'] = ['']
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
diff --git a/plugins/modules/ipadnszone.py b/plugins/modules/ipadnszone.py
index b9601c6a..4ed9a9d2 100644
--- a/plugins/modules/ipadnszone.py
+++ b/plugins/modules/ipadnszone.py
@@ -404,10 +404,9 @@ class DNSZoneModule(FreeIPABaseModule):
ip_version = ip.version
if ip_version == 4:
return u'.'.join(items[4 - prefixlen // 8:])
- elif ip_version == 6:
+ if ip_version == 6:
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):
get_zone_args = {"idnsname": zone_name, "all": True}
diff --git a/plugins/modules/ipahbacsvcgroup.py b/plugins/modules/ipahbacsvcgroup.py
index 560ebc56..141fa539 100644
--- a/plugins/modules/ipahbacsvcgroup.py
+++ b/plugins/modules/ipahbacsvcgroup.py
@@ -121,7 +121,7 @@ def find_hbacsvcgroup(module, name):
msg="There is more than one hbacsvcgroup '%s'" % (name))
elif len(_result["result"]) == 1:
return _result["result"][0]
-
+
return None
diff --git a/plugins/modules/ipaservice.py b/plugins/modules/ipaservice.py
index 77b934c1..cd55c76b 100644
--- a/plugins/modules/ipaservice.py
+++ b/plugins/modules/ipaservice.py
@@ -250,8 +250,8 @@ def find_service(module, name):
_res["usercertificate"] = [encode_certificate(cert) for
cert in certs]
return _res
- else:
- return None
+
+ return None
def gen_args(pac_type, auth_ind, skip_host_check, force, requires_pre_auth,
--
GitLab