mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-08 06:12:51 +00:00
[PR #11343/e8f2b135 backport][stable-12] batch 3 - update Python idiom to 3.7 using pyupgrade (#11352)
batch 3 - update Python idiom to 3.7 using pyupgrade (#11343)
* batch 3 - update Python idiom to 3.7 using pyupgrade
* add changelog frag
* bring back sanity
* adjust test
* Apply suggestions from code review
(cherry picked from commit e8f2b135ba)
Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
@@ -160,7 +160,7 @@ def run_module(module, tmpdir, kwriteconfig):
|
||||
try:
|
||||
with open(b_path, "rb") as src:
|
||||
b_data = src.read()
|
||||
except IOError:
|
||||
except OSError:
|
||||
result["changed"] = True
|
||||
else:
|
||||
dst.write(b_data)
|
||||
@@ -168,7 +168,7 @@ def run_module(module, tmpdir, kwriteconfig):
|
||||
diff["before"] = to_text(b_data)
|
||||
except UnicodeError:
|
||||
diff["before"] = repr(b_data)
|
||||
except IOError:
|
||||
except OSError:
|
||||
module.fail_json(msg="Unable to create temporary file", traceback=traceback.format_exc())
|
||||
|
||||
for row in module.params["values"]:
|
||||
@@ -211,7 +211,7 @@ def run_module(module, tmpdir, kwriteconfig):
|
||||
result["backup_file"] = module.backup_local(result["path"])
|
||||
try:
|
||||
module.atomic_move(b_tmpfile, os.path.abspath(b_path))
|
||||
except IOError:
|
||||
except OSError:
|
||||
module.ansible.fail_json(
|
||||
msg=f"Unable to move temporary file {tmpfile} to {result['path']}, IOError",
|
||||
traceback=traceback.format_exc(),
|
||||
|
||||
Reference in New Issue
Block a user