[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:
patchback[bot]
2025-12-30 22:43:24 +01:00
committed by GitHub
parent 2d07481e64
commit f49c5f79a7
26 changed files with 74 additions and 51 deletions

View File

@@ -349,7 +349,7 @@ def do_ini(
os.makedirs(destpath)
ini_lines = []
else:
with open(target_filename, "r", encoding="utf-8-sig") as ini_file:
with open(target_filename, encoding="utf-8-sig") as ini_file:
ini_lines = [to_text(line) for line in ini_file.readlines()]
if module._diff:
@@ -579,12 +579,12 @@ def do_ini(
f = os.fdopen(tmpfd, "wb")
f.writelines(encoded_ini_lines)
f.close()
except IOError:
except OSError:
module.fail_json(msg="Unable to create temporary file %s", traceback=traceback.format_exc())
try:
module.atomic_move(tmpfile, os.path.abspath(target_filename))
except IOError:
except OSError:
module.ansible.fail_json(
msg=f"Unable to move temporary file {tmpfile} to {target_filename}, IOError",
traceback=traceback.format_exc(),