mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-02-03 23:41:51 +00:00
fix ruff cases UP024,UP041 (#11391)
* fix ruff cases UP024,UP041 * add changelog frag
This commit is contained in:
parent
d4089ca29a
commit
b67c94fc3f
5 changed files with 10 additions and 11 deletions
|
|
@ -312,7 +312,6 @@ import io
|
|||
import os
|
||||
import pathlib
|
||||
import shlex
|
||||
import socket
|
||||
import tempfile
|
||||
import traceback
|
||||
import typing as t
|
||||
|
|
@ -667,7 +666,7 @@ class Connection(ConnectionBase):
|
|||
elif in_data == b"":
|
||||
chan.shutdown_write()
|
||||
|
||||
except socket.timeout as e:
|
||||
except TimeoutError as e:
|
||||
raise AnsibleError(f"ssh timed out waiting for privilege escalation.\n{to_text(become_output)}") from e
|
||||
|
||||
stdout = b"".join(chan.makefile("rb", bufsize))
|
||||
|
|
|
|||
|
|
@ -182,7 +182,6 @@ dns_rc_str:
|
|||
import traceback
|
||||
|
||||
from binascii import Error as binascii_error
|
||||
from socket import error as socket_error
|
||||
|
||||
DNSPYTHON_IMP_ERR = None
|
||||
try:
|
||||
|
|
@ -263,7 +262,7 @@ class RecordManager:
|
|||
)
|
||||
except (dns.tsig.PeerBadKey, dns.tsig.PeerBadSignature) as e:
|
||||
self.module.fail_json(msg=f"TSIG update error ({e.__class__.__name__}): {e}")
|
||||
except (socket_error, dns.exception.Timeout) as e:
|
||||
except (OSError, dns.exception.Timeout) as e:
|
||||
self.module.fail_json(msg=f"DNS server error: ({e.__class__.__name__}): {e}")
|
||||
if lookup.rcode() in [dns.rcode.SERVFAIL, dns.rcode.REFUSED]:
|
||||
self.module.fail_json(
|
||||
|
|
@ -298,7 +297,7 @@ class RecordManager:
|
|||
)
|
||||
except (dns.tsig.PeerBadKey, dns.tsig.PeerBadSignature) as e:
|
||||
self.module.fail_json(msg=f"TSIG update error ({e.__class__.__name__}): {e}")
|
||||
except (socket_error, dns.exception.Timeout) as e:
|
||||
except (OSError, dns.exception.Timeout) as e:
|
||||
self.module.fail_json(msg=f"DNS server error: ({e.__class__.__name__}): {e}")
|
||||
return response
|
||||
|
||||
|
|
@ -367,7 +366,7 @@ class RecordManager:
|
|||
)
|
||||
except (dns.tsig.PeerBadKey, dns.tsig.PeerBadSignature) as e:
|
||||
self.module.fail_json(msg=f"TSIG update error ({e.__class__.__name__}): {e}")
|
||||
except (socket_error, dns.exception.Timeout) as e:
|
||||
except (OSError, dns.exception.Timeout) as e:
|
||||
self.module.fail_json(msg=f"DNS server error: ({e.__class__.__name__}): {e}")
|
||||
|
||||
lookup_result = lookup.answer[0] if lookup.answer else lookup.authority[0]
|
||||
|
|
@ -458,7 +457,7 @@ class RecordManager:
|
|||
lookup = dns.query.udp(query, self.module.params["server"], timeout=10, port=self.module.params["port"])
|
||||
except (dns.tsig.PeerBadKey, dns.tsig.PeerBadSignature) as e:
|
||||
self.module.fail_json(msg=f"TSIG update error ({e.__class__.__name__}): {e}")
|
||||
except (socket_error, dns.exception.Timeout) as e:
|
||||
except (OSError, dns.exception.Timeout) as e:
|
||||
self.module.fail_json(msg=f"DNS server error: ({e.__class__.__name__}): {e}")
|
||||
|
||||
if lookup.rcode() != dns.rcode.NOERROR:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue