pylint: Fix warning 'unnecessary "else" after "return"'

Recent pylint versions warn against the use of an 'else' in a
'try-except' block if using a 'return' on the 'except' part is is the
idom used by ansible-freeipa when retrieving IPA data objects.

This change removes the usage of the 'else:' in such cases, and modify
the templates so that new modules do not have the same issue in the
future.
This commit is contained in:
Rafael Guterres Jeffman
2023-07-12 18:01:59 -03:00
parent fd1352ad7e
commit 24efad73fa
19 changed files with 20 additions and 40 deletions

View File

@@ -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]

View File

@@ -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):

View File

@@ -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):