ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-24 20:59:16 +00:00
Code Activity

[PR #11341/5b5f7e9e backport][stable-12] batch 1 - update Python idiom to 3.7 using pyupgrade (#11349)

Browse source 
batch 1 - update Python idiom to 3.7 using pyupgrade (#11341)

* batch 1 - update Python idiom to 3.7 using pyupgrade

* add changelog frag

* add changelog frag

(cherry picked from commit 5b5f7e9e64)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
patchback[bot] 2025-12-30 16:47:11 +01:00 • committed by GitHub
parent 41f815be57
commit 2d07481e64
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 48 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/connection/chroot.py
View file

@ -200,7 +200,7 @@ class Connection(ConnectionBase):
raise AnsibleError(f"failed to transfer file {in_path} to {out_path}") from e
if p.returncode != 0:
raise AnsibleError(f"failed to transfer file {in_path} to {out_path}:\n{stdout}\n{stderr}")
except IOError as e:
except OSError as e:
raise AnsibleError(f"file or module does not exist at: {in_path}") from e
def fetch_file(self, in_path, out_path):

2
plugins/connection/jail.py
View file

@ -172,7 +172,7 @@ class Connection(ConnectionBase):
raise AnsibleError(
f"failed to transfer file {in_path} to {out_path}:\n{to_native(stdout)}\n{to_native(stderr)}"
)
except IOError as e:
except OSError as e:
raise AnsibleError(f"file or module does not exist at: {in_path}") from e
def fetch_file(self, in_path, out_path):

10
plugins/connection/lxc.py
View file

@ -94,7 +94,7 @@ class Connection(ConnectionBase):
while len(read_fds) > 0 or len(write_fds) > 0:
try:
ready_reads, ready_writes, dummy = select.select(read_fds, write_fds, [])
except select.error as e:
except OSError as e:
if e.args[0] == errno.EINTR:
continue
raise
@ -173,7 +173,7 @@ class Connection(ConnectionBase):
raise errors.AnsibleFileNotFound(msg)
try:
src_file = open(in_path, "rb")
except IOError as e:
except OSError as e:
traceback.print_exc()
raise errors.AnsibleError(f"failed to open input file to {in_path}") from e
try:
@ -184,7 +184,7 @@ class Connection(ConnectionBase):
try:
self.container.attach_wait(write_file, None)
except IOError as e:
except OSError as e:
traceback.print_exc()
msg = f"failed to transfer file to {out_path}"
raise errors.AnsibleError(msg) from e
@ -200,7 +200,7 @@ class Connection(ConnectionBase):
try:
dst_file = open(out_path, "wb")
except IOError as e:
except OSError as e:
traceback.print_exc()
msg = f"failed to open output file {out_path}"
raise errors.AnsibleError(msg) from e
@ -217,7 +217,7 @@ class Connection(ConnectionBase):
try:
self.container.attach_wait(write_file, None)
except IOError as e:
except OSError as e:
traceback.print_exc()
msg = f"failed to transfer file from {in_path} to {out_path}"
raise errors.AnsibleError(msg) from e

2
plugins/connection/wsl.py
View file

@ -475,7 +475,7 @@ class Connection(ConnectionBase):
try:
ssh.load_system_host_keys(ssh_known_hosts)
break
except IOError:
except OSError:
pass # file was not found, but not required to function
except paramiko.hostkeys.InvalidHostKey as e:
raise AnsibleConnectionFailure(f"Invalid host key: {to_text(e.line)}") from e

2
plugins/connection/zone.py
View file

@ -169,7 +169,7 @@ class Connection(ConnectionBase):
raise AnsibleError(f"failed to transfer file {in_path} to {out_path}") from e
if p.returncode != 0:
raise AnsibleError(f"failed to transfer file {in_path} to {out_path}:\n{stdout}\n{stderr}")
except IOError as e:
except OSError as e:
raise AnsibleError(f"file or module does not exist at: {in_path}") from e
def fetch_file(self, in_path, out_path):