ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-10 22:15:05 +00:00
Code Activity

[PR #11344/543329ce backport][stable-12] batch 4 - update Python idiom to 3.7 using pyupgrade (#11350)

Browse source 
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:
patchback[bot] 2025-12-30 16:31:29 +01:00 • committed by GitHub
parent 8d4e702d89
commit 41f815be57
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
33 changed files with 96 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/modules/sorcery.py
View file

@ -369,7 +369,7 @@ def match_depends(module):
try:
shutil.copy2(sorcery_depends_orig, sorcery_depends)
except IOError:
except OSError:
module.fail_json(msg="failed to copy depends.check file")
else:
sorcery_depends = os.path.join(SORCERY_STATE_DIR, "depends")
@ -441,7 +441,7 @@ def match_depends(module):
sys.stdout.write(line)
else:
sys.stdout.write(line)
except IOError:
except OSError:
module.fail_json(msg="I/O error on the depends file")
finally:
fi.close()
@ -453,7 +453,7 @@ def match_depends(module):
with open(sorcery_depends, "a") as fl:
for k in depends_new:
fl.write(f"{spell}:{k}:{depends[k]}:optional::\n")
except IOError:
except OSError:
module.fail_json(msg="I/O error on the depends file")
depends_ok = False
@ -461,7 +461,7 @@ def match_depends(module):
if module.check_mode:
try:
os.remove(sorcery_depends)
except IOError:
except OSError:
module.fail_json(msg="failed to clean up depends.backup file")
return depends_ok
@ -545,7 +545,7 @@ def manage_spells(module):
# back up original queue
try:
os.rename(sorcery_queue, f"{sorcery_queue}.backup")
except IOError:
except OSError:
module.fail_json(msg="failed to backup the update queue")
# see update_codex()
@ -567,7 +567,7 @@ def manage_spells(module):
if module.check_mode:
try:
os.rename(f"{sorcery_queue}.backup", sorcery_queue)
except IOError:
except OSError:
module.fail_json(msg="failed to restore the update queue")
return (True, "would have updated the system")