diff --git a/plugins/modules/ipaautomountkey.py b/plugins/modules/ipaautomountkey.py index 5b172a2f..d29422a1 100644 --- a/plugins/modules/ipaautomountkey.py +++ b/plugins/modules/ipaautomountkey.py @@ -121,8 +121,7 @@ class AutomountKey(IPAAnsibleModule): resp = self.ipa_command("automountkey_show", location, args) except ipalib_errors.NotFound: return None - else: - return resp.get("result") + return resp.get("result") def check_ipa_params(self): invalid = [] diff --git a/plugins/modules/ipaautomountlocation.py b/plugins/modules/ipaautomountlocation.py index c2f82b35..f679f2fa 100644 --- a/plugins/modules/ipaautomountlocation.py +++ b/plugins/modules/ipaautomountlocation.py @@ -92,8 +92,7 @@ class AutomountLocation(IPAAnsibleModule): ) except ipalib_errors.NotFound: return None - else: - return response.get("result", None) + return response.get("result", None) def check_ipa_params(self): if len(self.params_get("name")) == 0: diff --git a/plugins/modules/ipaautomountmap.py b/plugins/modules/ipaautomountmap.py index 668e887a..bf0c438e 100644 --- a/plugins/modules/ipaautomountmap.py +++ b/plugins/modules/ipaautomountmap.py @@ -126,8 +126,7 @@ class AutomountMap(IPAAnsibleModule): ) except Exception: # pylint: disable=broad-except return None - else: - return response["result"] + return response["result"] def get_indirect_map_keys(self, location, name): """Check if 'name' is an indirect map for 'parentmap'.""" diff --git a/plugins/modules/ipaconfig.py b/plugins/modules/ipaconfig.py index 37c06fad..8e6bb98f 100644 --- a/plugins/modules/ipaconfig.py +++ b/plugins/modules/ipaconfig.py @@ -358,8 +358,7 @@ def get_netbios_name(module): _result = module.ipa_command_no_name("trustconfig_show", {"all": True}) except Exception: # pylint: disable=broad-except return None - else: - return _result["result"]["ipantflatname"][0] + return _result["result"]["ipantflatname"][0] def is_enable_sid(module): diff --git a/plugins/modules/ipadelegation.py b/plugins/modules/ipadelegation.py index c892b7df..e30d3d70 100644 --- a/plugins/modules/ipadelegation.py +++ b/plugins/modules/ipadelegation.py @@ -134,8 +134,7 @@ def find_delegation(module, name): except Exception: # pylint: disable=broad-except # An exception is raised if delegation name is not found. return None - else: - return _result["result"] + return _result["result"] def gen_args(permission, attribute, membergroup, group): diff --git a/plugins/modules/ipaidrange.py b/plugins/modules/ipaidrange.py index 5071e480..5d70adbc 100644 --- a/plugins/modules/ipaidrange.py +++ b/plugins/modules/ipaidrange.py @@ -157,8 +157,7 @@ def find_idrange(module, name): except Exception: # pylint: disable=broad-except # An exception is raised if idrange name is not found. return None - else: - return _result["result"] + return _result["result"] def gen_args( diff --git a/plugins/modules/ipaidview.py b/plugins/modules/ipaidview.py index b6b7a44d..b7065155 100644 --- a/plugins/modules/ipaidview.py +++ b/plugins/modules/ipaidview.py @@ -141,8 +141,7 @@ def find_idview(module, name): except Exception: # pylint: disable=broad-except # An exception is raised if idview name is not found. return None - else: - return _result["result"] + return _result["result"] def gen_args(description, domain_resolution_order): diff --git a/plugins/modules/ipalocation.py b/plugins/modules/ipalocation.py index d941658c..667e77b2 100644 --- a/plugins/modules/ipalocation.py +++ b/plugins/modules/ipalocation.py @@ -86,8 +86,7 @@ def find_location(module, name): except Exception: # pylint: disable=broad-except # An exception is raised if location name is not found. return None - else: - return _result["result"] + return _result["result"] def gen_args(description): diff --git a/plugins/modules/ipapermission.py b/plugins/modules/ipapermission.py index 622b1cc3..1ed25722 100644 --- a/plugins/modules/ipapermission.py +++ b/plugins/modules/ipapermission.py @@ -164,8 +164,7 @@ def find_permission(module, name): except Exception: # pylint: disable=broad-except # An exception is raised if permission name is not found. return None - else: - return _result["result"] + return _result["result"] def gen_args(right, attrs, bindtype, subtree, diff --git a/plugins/modules/ipaprivilege.py b/plugins/modules/ipaprivilege.py index 4fb810bd..60033bd9 100644 --- a/plugins/modules/ipaprivilege.py +++ b/plugins/modules/ipaprivilege.py @@ -138,8 +138,7 @@ def find_privilege(module, name): except Exception: # pylint: disable=broad-except # An exception is raised if privilege name is not found. return None - else: - return _result["result"] + return _result["result"] def main(): diff --git a/plugins/modules/iparole.py b/plugins/modules/iparole.py index 9952dd7d..2e876268 100644 --- a/plugins/modules/iparole.py +++ b/plugins/modules/iparole.py @@ -143,8 +143,7 @@ def find_role(module, name): except Exception: # pylint: disable=broad-except # An exception is raised if role name is not found. return None - else: - return _result["result"] + return _result["result"] def gen_args(module): diff --git a/plugins/modules/ipaselfservice.py b/plugins/modules/ipaselfservice.py index 52cd6e27..a7480ad6 100644 --- a/plugins/modules/ipaselfservice.py +++ b/plugins/modules/ipaselfservice.py @@ -123,8 +123,7 @@ def find_selfservice(module, name): except Exception: # pylint: disable=broad-except # An exception is raised if selfservice name is not found. return None - else: - return _result["result"] + return _result["result"] def gen_args(permission, attribute): diff --git a/plugins/modules/ipaserver.py b/plugins/modules/ipaserver.py index 0d9def27..35755ae1 100644 --- a/plugins/modules/ipaserver.py +++ b/plugins/modules/ipaserver.py @@ -202,8 +202,7 @@ def find_server(module, name): except Exception: # pylint: disable=broad-except # An exception is raised if server name is not found. return None - else: - return _result["result"] + return _result["result"] def server_role_status(module, name): @@ -218,8 +217,7 @@ def server_role_status(module, name): except Exception: # pylint: disable=broad-except # An exception is raised if server name is not found. return None - else: - return _result["result"][0] + return _result["result"][0] def gen_args(location, service_weight, no_members, delete_continue, diff --git a/plugins/modules/ipaservicedelegationrule.py b/plugins/modules/ipaservicedelegationrule.py index 35214b05..4b9e3435 100644 --- a/plugins/modules/ipaservicedelegationrule.py +++ b/plugins/modules/ipaservicedelegationrule.py @@ -145,8 +145,7 @@ def find_servicedelegationrule(module, name): except Exception: # pylint: disable=broad-except # An exception is raised if servicedelegationrule name is not found. return None - else: - return _result["result"] + return _result["result"] def check_targets(module, targets): diff --git a/plugins/modules/ipaservicedelegationtarget.py b/plugins/modules/ipaservicedelegationtarget.py index 9c3c990f..85708314 100644 --- a/plugins/modules/ipaservicedelegationtarget.py +++ b/plugins/modules/ipaservicedelegationtarget.py @@ -121,8 +121,7 @@ def find_servicedelegationtarget(module, name): except Exception: # pylint: disable=broad-except # An exception is raised if servicedelegationtarget name is not found. return None - else: - return _result["result"] + return _result["result"] def main(): diff --git a/plugins/modules/ipasudocmdgroup.py b/plugins/modules/ipasudocmdgroup.py index d6154598..c9baf6c4 100644 --- a/plugins/modules/ipasudocmdgroup.py +++ b/plugins/modules/ipasudocmdgroup.py @@ -122,8 +122,7 @@ def find_sudocmdgroup(module, name): _result = module.ipa_command("sudocmdgroup_show", name, args) except ipalib_errors.NotFound: return None - else: - return _result["result"] + return _result["result"] def gen_args(description, nomembers): diff --git a/utils/get_test_modules.py b/utils/get_test_modules.py index cb20e0d6..2f83176e 100644 --- a/utils/get_test_modules.py +++ b/utils/get_test_modules.py @@ -62,8 +62,7 @@ def get_plugins_from_playbook(playbook): return [] except yaml.parser.ParserError: # If not a YAML/JSON file. return [] - else: - return data if data else [] + return data if data else [] data = load_playbook(playbook) task_blocks = [t.get("tasks", []) if "tasks" in t else [] for t in data] diff --git a/utils/templates/ipamodule+member.py.in b/utils/templates/ipamodule+member.py.in index 5ce5cf1b..5e763ef7 100644 --- a/utils/templates/ipamodule+member.py.in +++ b/utils/templates/ipamodule+member.py.in @@ -127,8 +127,7 @@ def find_$name(module, name): except Exception: # pylint: disable=broad-except # An exception is raised if $name name is not found. return None - else: - return _result["result"] + return _result["result"] def gen_args(PARAMETER1): diff --git a/utils/templates/ipamodule.py.in b/utils/templates/ipamodule.py.in index aa52257b..e358f322 100644 --- a/utils/templates/ipamodule.py.in +++ b/utils/templates/ipamodule.py.in @@ -103,8 +103,7 @@ def find_$name(module, name): except Exception: # pylint: disable=broad-except # An exception is raised if $name name is not found. return None - else: - return _result["result"] + return _result["result"] def gen_args(PARAMETER1, PARAMETER2):