mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-03-22 13:19:13 +00:00
[PR #11344/543329ce backport][stable-12] batch 4 - update Python idiom to 3.7 using pyupgrade (#11350)
batch 4 - update Python idiom to 3.7 using pyupgrade (#11344)
* batch 4 - update Python idiom to 3.7 using pyupgrade
* add changelog frag
* bring back sanity
* remove unused import
(cherry picked from commit 543329cecb)
Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
parent
8d4e702d89
commit
41f815be57
33 changed files with 96 additions and 64 deletions
|
|
@ -252,8 +252,8 @@ def main():
|
|||
# Load the current config, if there is one, so we can compare
|
||||
current_config = None
|
||||
try:
|
||||
current_config = json.load(open(path, "r"))
|
||||
except (IOError, ValueError):
|
||||
current_config = json.load(open(path))
|
||||
except (OSError, ValueError):
|
||||
# File either doesn't exist or it is invalid JSON
|
||||
pass
|
||||
|
||||
|
|
@ -285,7 +285,7 @@ def main():
|
|||
module.exit_json(
|
||||
msg="Handler configuration updated", changed=True, config=config["handlers"][name], file=path, name=name
|
||||
)
|
||||
except (OSError, IOError) as e:
|
||||
except OSError as e:
|
||||
module.fail_json(msg=f"Unable to write file {path}: {e}")
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue