From 59d4d1b146aa05a3c9b9b21ecbaeea5cf0ece05d Mon Sep 17 00:00:00 2001
From: Rafael Guterres Jeffman <rjeffman@redhat.com>
Date: Thu, 29 Apr 2021 18:27:33 -0300
Subject: [PATCH] Fix or disable pylint warnings for inconsistent return.
In some places, disabling the warnings rather than fixing it required
less changes, without compromising readability.
---
plugins/module_utils/ansible_freeipa_module.py | 7 +++++--
plugins/modules/ipadnsforwardzone.py | 4 ++--
plugins/modules/ipadnszone.py | 18 +++++++++---------
plugins/modules/ipagroup.py | 4 ++--
plugins/modules/ipahbacrule.py | 4 ++--
plugins/modules/ipahbacsvc.py | 4 ++--
plugins/modules/ipahbacsvcgroup.py | 4 ++--
plugins/modules/ipahostgroup.py | 4 ++--
plugins/modules/ipapwpolicy.py | 4 ++--
plugins/modules/ipasudocmd.py | 4 ++--
plugins/modules/ipasudorule.py | 4 ++--
plugins/modules/ipatopologysegment.py | 8 ++++----
plugins/modules/ipatrust.py | 8 ++------
plugins/modules/ipauser.py | 5 ++---
14 files changed, 40 insertions(+), 42 deletions(-)
diff --git a/plugins/module_utils/ansible_freeipa_module.py b/plugins/module_utils/ansible_freeipa_module.py
index a725af01..a1f14020 100644
--- a/plugins/module_utils/ansible_freeipa_module.py
+++ b/plugins/module_utils/ansible_freeipa_module.py
@@ -258,6 +258,8 @@ else:
finally:
temp_kdestroy(ccache_dir, ccache_name)
+ # fix pylint inconsistent return
+ return None
def date_format(value):
accepted_date_formats = [
@@ -536,8 +538,9 @@ else:
def __getitem__(self, key):
param = self.mapping[key]
- if param is not None:
- return _afm_convert(param)
+ if param is None:
+ return None
+ return _afm_convert(param)
def __iter__(self):
return iter(self.mapping)
diff --git a/plugins/modules/ipadnsforwardzone.py b/plugins/modules/ipadnsforwardzone.py
index ffebc3d2..5df7a1e8 100644
--- a/plugins/modules/ipadnsforwardzone.py
+++ b/plugins/modules/ipadnsforwardzone.py
@@ -135,8 +135,8 @@ def find_dnsforwardzone(module, name):
msg="There is more than one dnsforwardzone '%s'" % (name))
elif len(_result["result"]) == 1:
return _result["result"][0]
- else:
- return None
+
+ return None
def gen_args(forwarders, forwardpolicy, skip_overlap_check):
diff --git a/plugins/modules/ipadnszone.py b/plugins/modules/ipadnszone.py
index dbaa331b..b9601c6a 100644
--- a/plugins/modules/ipadnszone.py
+++ b/plugins/modules/ipadnszone.py
@@ -298,7 +298,7 @@ class DNSZoneModule(FreeIPABaseModule):
return True
- def get_ipa_nsec3paramrecord(self, **_kwargs):
+ def get_ipa_nsec3paramrecord(self, **_kwargs): # pylint: disable=R1710
nsec3param_rec = self.ipa_params.nsec3param_rec
if nsec3param_rec is not None:
error_msg = (
@@ -310,7 +310,7 @@ class DNSZoneModule(FreeIPABaseModule):
self.fail_json(msg=error_msg)
return nsec3param_rec
- def get_ipa_idnsforwarders(self, **_kwargs):
+ def get_ipa_idnsforwarders(self, **_kwargs): # pylint: disable=R1710
if self.ipa_params.forwarders is not None:
forwarders = []
for forwarder in self.ipa_params.forwarders:
@@ -334,14 +334,14 @@ class DNSZoneModule(FreeIPABaseModule):
return forwarders
- def get_ipa_idnsallowtransfer(self, **_kwargs):
+ def get_ipa_idnsallowtransfer(self, **_kwargs): # pylint: disable=R1710
if self.ipa_params.allow_transfer is not None:
error_msg = "Invalid ip_address for DNS allow_transfer: %s"
self.validate_ips(self.ipa_params.allow_transfer, error_msg)
return (";".join(self.ipa_params.allow_transfer) or "none") + ";"
- def get_ipa_idnsallowquery(self, **_kwargs):
+ def get_ipa_idnsallowquery(self, **_kwargs): # pylint: disable=R1710
if self.ipa_params.allow_query is not None:
error_msg = "Invalid ip_address for DNS allow_query: %s"
self.validate_ips(self.ipa_params.allow_query, error_msg)
@@ -364,27 +364,27 @@ class DNSZoneModule(FreeIPABaseModule):
return ".".join((name, domain))
- def get_ipa_idnssoarname(self, **_kwargs):
+ def get_ipa_idnssoarname(self, **_kwargs): # pylint: disable=R1710
if self.ipa_params.admin_email is not None:
return DNSName(
self._replace_at_symbol_in_rname(self.ipa_params.admin_email)
)
- def get_ipa_idnssoamname(self, **_kwargs):
+ def get_ipa_idnssoamname(self, **_kwargs): # pylint: disable=R1710
if self.ipa_params.name_server is not None:
return DNSName(self.ipa_params.name_server)
- def get_ipa_skip_overlap_check(self, **kwargs):
+ def get_ipa_skip_overlap_check(self, **kwargs): # pylint: disable=R1710
zone = kwargs.get('zone')
if not zone and self.ipa_params.skip_overlap_check is not None:
return self.ipa_params.skip_overlap_check
- def get_ipa_skip_nameserver_check(self, **kwargs):
+ def get_ipa_skip_nameserver_check(self, **kwargs): # pylint: disable=R1710
zone = kwargs.get('zone')
if not zone and self.ipa_params.skip_nameserver_check is not None:
return self.ipa_params.skip_nameserver_check
- def __reverse_zone_name(self, ipaddress):
+ def __reverse_zone_name(self, ipaddress): # pylint: disable=R1710
"""
Infer reverse zone name from an ip address.
diff --git a/plugins/modules/ipagroup.py b/plugins/modules/ipagroup.py
index e7072f08..bfddebf4 100644
--- a/plugins/modules/ipagroup.py
+++ b/plugins/modules/ipagroup.py
@@ -201,8 +201,8 @@ def find_group(module, name):
msg="There is more than one group '%s'" % (name))
elif len(_result["result"]) == 1:
return _result["result"][0]
- else:
- return None
+
+ return None
def gen_args(description, gid, nomembers):
diff --git a/plugins/modules/ipahbacrule.py b/plugins/modules/ipahbacrule.py
index 12fad26c..010f68a9 100644
--- a/plugins/modules/ipahbacrule.py
+++ b/plugins/modules/ipahbacrule.py
@@ -175,8 +175,8 @@ def find_hbacrule(module, name):
msg="There is more than one hbacrule '%s'" % (name))
elif len(_result["result"]) == 1:
return _result["result"][0]
- else:
- return None
+
+ return None
def gen_args(description, usercategory, hostcategory, servicecategory,
diff --git a/plugins/modules/ipahbacsvc.py b/plugins/modules/ipahbacsvc.py
index 1ead6d53..26e6a957 100644
--- a/plugins/modules/ipahbacsvc.py
+++ b/plugins/modules/ipahbacsvc.py
@@ -89,8 +89,8 @@ def find_hbacsvc(module, name):
msg="There is more than one hbacsvc '%s'" % (name))
elif len(_result["result"]) == 1:
return _result["result"][0]
- else:
- return None
+
+ return None
def gen_args(description):
diff --git a/plugins/modules/ipahbacsvcgroup.py b/plugins/modules/ipahbacsvcgroup.py
index 6676bca7..560ebc56 100644
--- a/plugins/modules/ipahbacsvcgroup.py
+++ b/plugins/modules/ipahbacsvcgroup.py
@@ -121,8 +121,8 @@ def find_hbacsvcgroup(module, name):
msg="There is more than one hbacsvcgroup '%s'" % (name))
elif len(_result["result"]) == 1:
return _result["result"][0]
- else:
- return None
+
+ return None
def gen_args(description, nomembers):
diff --git a/plugins/modules/ipahostgroup.py b/plugins/modules/ipahostgroup.py
index 8c594353..ff13cc59 100644
--- a/plugins/modules/ipahostgroup.py
+++ b/plugins/modules/ipahostgroup.py
@@ -157,8 +157,8 @@ def find_hostgroup(module, name):
msg="There is more than one hostgroup '%s'" % (name))
elif len(_result["result"]) == 1:
return _result["result"][0]
- else:
- return None
+
+ return None
def gen_args(description, nomembers, rename):
diff --git a/plugins/modules/ipapwpolicy.py b/plugins/modules/ipapwpolicy.py
index 77fa023d..c9509f4d 100644
--- a/plugins/modules/ipapwpolicy.py
+++ b/plugins/modules/ipapwpolicy.py
@@ -130,8 +130,8 @@ def find_pwpolicy(module, name):
msg="There is more than one pwpolicy '%s'" % (name))
elif len(_result["result"]) == 1:
return _result["result"][0]
- else:
- return None
+
+ return None
def gen_args(maxlife, minlife, history, minclasses, minlength, priority,
diff --git a/plugins/modules/ipasudocmd.py b/plugins/modules/ipasudocmd.py
index ca484ba9..08344f41 100644
--- a/plugins/modules/ipasudocmd.py
+++ b/plugins/modules/ipasudocmd.py
@@ -90,8 +90,8 @@ def find_sudocmd(module, name):
msg="There is more than one sudocmd '%s'" % (name))
elif len(_result["result"]) == 1:
return _result["result"][0]
- else:
- return None
+
+ return None
def gen_args(description):
diff --git a/plugins/modules/ipasudorule.py b/plugins/modules/ipasudorule.py
index 47735480..332423f4 100644
--- a/plugins/modules/ipasudorule.py
+++ b/plugins/modules/ipasudorule.py
@@ -206,8 +206,8 @@ def find_sudorule(module, name):
msg="There is more than one sudorule '%s'" % (name))
elif len(_result["result"]) == 1:
return _result["result"][0]
- else:
- return None
+
+ return None
def gen_args(description, usercat, hostcat, cmdcat, runasusercat,
diff --git a/plugins/modules/ipatopologysegment.py b/plugins/modules/ipatopologysegment.py
index 4d522bda..d2909025 100644
--- a/plugins/modules/ipatopologysegment.py
+++ b/plugins/modules/ipatopologysegment.py
@@ -132,8 +132,8 @@ def find_left_right(module, suffix, left, right):
"not unique for suffix '%s'" % (left, right, suffix))
elif len(_result["result"]) == 1:
return _result["result"][0]
- else:
- return None
+
+ return None
def find_cn(module, suffix, name):
@@ -147,8 +147,8 @@ def find_cn(module, suffix, name):
msg="CN '%s' is not unique for suffix '%s'" % (name, suffix))
elif len(_result["result"]) == 1:
return _result["result"][0]
- else:
- return None
+
+ return None
def find_left_right_cn(module, suffix, left, right, name):
diff --git a/plugins/modules/ipatrust.py b/plugins/modules/ipatrust.py
index 80eb3ea8..3c14077b 100644
--- a/plugins/modules/ipatrust.py
+++ b/plugins/modules/ipatrust.py
@@ -125,8 +125,8 @@ def find_trust(module, realm):
module.fail_json(msg="There is more than one realm '%s'" % (realm))
elif len(_result["result"]) == 1:
return _result["result"][0]
- else:
- return None
+
+ return None
def del_trust(module, realm):
@@ -136,8 +136,6 @@ def del_trust(module, realm):
if len(_result["result"]["failed"]) > 0:
module.fail_json(
msg="Trust deletion has failed for '%s'" % (realm))
- else:
- return None
def add_trust(module, realm, args):
@@ -148,8 +146,6 @@ def add_trust(module, realm, args):
if "cn" not in _result["result"]:
module.fail_json(
msg="Trust add has failed for '%s'" % (realm))
- else:
- return None
def gen_args(trust_type, admin, password, server, trust_secret, base_id,
diff --git a/plugins/modules/ipauser.py b/plugins/modules/ipauser.py
index 576fc59b..23b9710e 100644
--- a/plugins/modules/ipauser.py
+++ b/plugins/modules/ipauser.py
@@ -512,10 +512,9 @@ def find_user(module, name, preserved=False):
if certs is not None:
_result["usercertificate"] = [encode_certificate(x)
for x in certs]
-
return _result
- else:
- return None
+
+ return None
def gen_args(first, last, fullname, displayname, initials, homedir, shell,
--
GitLab