diff --git a/plugins/modules/ipaautomountkey.py b/plugins/modules/ipaautomountkey.py
index 5b172a2fc62a196cc9a5a9c4834e657d8f21b42a..d29422a11ec703494ba50facdbc3b965d38f8658 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 c2f82b354daa1b3af2fd9ea65cccdbf524aee397..f679f2fa49eeb9009b58feaee122606de011552c 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 668e887a313a5936101e787bf6fa1cff0e925d81..bf0c438e360eab2915d26e4d1537b0bdc203697b 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 37c06fad2cd825c253e9844cfab68e7988d07193..8e6bb98f91e9c78a7e7bf4de203232b82a1ca3a2 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 c892b7df3bb387e9f29941fc30823288bc4d1aa1..e30d3d7008d31322f4e7ce71f01c6a8bd21d3ceb 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 5071e4809d5d9c335ec4960247e6914a6c610923..5d70adbcf8995bcf36452c73e1a5762dc0c67091 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 b6b7a44dcc3584067a44395a91b6729bb4d076ed..b7065155ee6e2667205f1a6f8a6dd719620d4e30 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 d941658c0ae2adc2fe767de9af4f4d2df9bad49e..667e77b280730a5fcbddb3539010c93758ff7b6d 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 622b1cc358a171aabe651cee1000d483d0691105..1ed25722a233379828ace389c3670af4515cac73 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 4fb810bdb43f1780ba5a52a46c4a1957fedaaf7a..60033bd99e597f33dcebff5f8d1961d018399300 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 9952dd7db00ece0e62366e9b00cde6e4d1cd1a76..2e876268026e9ae11e8a6eda293cc166cd4bd504 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 52cd6e278ed63a152c4841d5cd401819ddf80b6a..a7480ad6734932b843781ee556372852acb5f0d6 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 0d9def27de20fe21d4279e7a864551d6dc9b9521..35755ae1355c4e62e9a1491452ef91ebfa3f9963 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 35214b05fba3b31d23c840692d2c16a7c827d31d..4b9e3435bb170a2fb1779e1a24035a22cc82186d 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 9c3c990f72f824712f1c17cc6d6624a1f4c92325..857083145f323a4e80f62b1a26ba5948aa5d99d2 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 d6154598dca5e73cefc02e48898d4b317bcdd1c8..c9baf6c482f5262db396ead6c8d91fde4e1620ba 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 cb20e0d65eebe1cdebffb4543391829b69bd0366..2f83176e34e75a00599f43e33c749c5165a153a3 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 5ce5cf1b34beb3d0b2a9d5dae05d57eb7e8edf0f..5e763ef7f6456335b9b0e366af2ef01227ac65f1 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 aa52257bd628b5feebfae2dcc7e75f5e24717840..e358f322036129001d03199acadc41f2ba2143b5 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):