ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-08 13:07:19 +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

18
plugins/modules/timezone.py
View file

@ -376,9 +376,9 @@ class NosystemdTimezone(Timezone):
self.conf_files["name"] = "/etc/sysconfig/clock"
self.conf_files["hwclock"] = "/etc/sysconfig/clock"
try:
with open(self.conf_files["name"], "r") as f:
with open(self.conf_files["name"]) as f:
sysconfig_clock = f.read()
except IOError as err:
except OSError as err:
if self._allow_ioerror(err, "name"):
# If the config file doesn't exist detect the distribution and set regexps.
if distribution == "SuSE":
@ -427,9 +427,9 @@ class NosystemdTimezone(Timezone):
"""
# Read the file
try:
with open(filename, "r") as file:
with open(filename) as file:
lines = file.readlines()
except IOError as err:
except OSError as err:
if self._allow_ioerror(err, key):
lines = []
else:
@ -452,16 +452,16 @@ class NosystemdTimezone(Timezone):
try:
with open(filename, "w") as file:
file.writelines(lines)
except IOError:
except OSError:
self.abort(f'tried to configure {key} using a file "{filename}", but could not write to it')
self.msg.append(f"Added 1 line and deleted {len(matched_indices)} line(s) on {filename}")
def _get_value_from_config(self, key, phase):
filename = self.conf_files[key]
try:
with open(filename, mode="r") as file:
with open(filename) as file:
status = file.read()
except IOError as err:
except OSError as err:
if self._allow_ioerror(err, key):
if key == "hwclock":
return "n/a"
@ -602,7 +602,7 @@ class SmartOSTimezone(Timezone):
"""
if key == "name":
try:
with open("/etc/default/init", "r") as f:
with open("/etc/default/init") as f:
for line in f:
m = re.match("^TZ=(.*)$", line.strip())
if m:
@ -783,7 +783,7 @@ class AIXTimezone(Timezone):
def __get_timezone(self):
"""Return the current value of TZ= in /etc/environment"""
try:
with open("/etc/environment", "r") as f:
with open("/etc/environment") as f:
etcenvironment = f.read()
except Exception:
self.module.fail_json(msg="Issue reading contents of /etc/environment")