Fix linting: use builtin OSError and TimeoutError instead of socket aliases
This commit is contained in:
@@ -71,7 +71,7 @@ class TCPTransport(Transport):
|
||||
self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
self._socket.settimeout(self._timeout)
|
||||
self._socket.connect((self._host, self._port))
|
||||
except (socket.error, OSError) as err:
|
||||
except OSError as err:
|
||||
self._socket = None
|
||||
raise ConnectionError(
|
||||
f"Failed to connect to {self._host}:{self._port}: {err}"
|
||||
@@ -108,7 +108,7 @@ class TCPTransport(Transport):
|
||||
try:
|
||||
message = f"{command}\n".encode(self._encoding)
|
||||
self._socket.sendall(message)
|
||||
except (socket.error, OSError) as err:
|
||||
except OSError as err:
|
||||
raise OSError(f"Write failed: {err}") from err
|
||||
|
||||
def read(self, timeout: float | None = None) -> str:
|
||||
@@ -151,9 +151,9 @@ class TCPTransport(Transport):
|
||||
|
||||
except ConnectionError:
|
||||
raise # Re-raise ConnectionError as-is
|
||||
except socket.timeout as err:
|
||||
except TimeoutError as err:
|
||||
raise TimeoutError("Read timeout") from err
|
||||
except (socket.error, OSError, UnicodeDecodeError) as err:
|
||||
except (OSError, UnicodeDecodeError) as err:
|
||||
raise OSError(f"Read failed: {err}") from err
|
||||
finally:
|
||||
# Restore original timeout
|
||||
|
||||
@@ -64,7 +64,7 @@ class TestTCPTransport:
|
||||
"""Test connection failure raises ConnectionError."""
|
||||
mock_sock = MagicMock()
|
||||
mock_socket_class.return_value = mock_sock
|
||||
mock_sock.connect.side_effect = socket.error("Connection refused")
|
||||
mock_sock.connect.side_effect = OSError("Connection refused")
|
||||
|
||||
with pytest.raises(ConnectionError, match="Failed to connect"):
|
||||
transport.connect()
|
||||
@@ -113,7 +113,7 @@ class TestTCPTransport:
|
||||
"""Test write failure raises IOError."""
|
||||
mock_sock = MagicMock()
|
||||
mock_socket_class.return_value = mock_sock
|
||||
mock_sock.sendall.side_effect = socket.error("Write failed")
|
||||
mock_sock.sendall.side_effect = OSError("Write failed")
|
||||
|
||||
transport.connect()
|
||||
|
||||
@@ -167,7 +167,7 @@ class TestTCPTransport:
|
||||
"""Test read timeout raises TimeoutError."""
|
||||
mock_sock = MagicMock()
|
||||
mock_socket_class.return_value = mock_sock
|
||||
mock_sock.recv.side_effect = socket.timeout("Timed out")
|
||||
mock_sock.recv.side_effect = TimeoutError("Timed out")
|
||||
|
||||
transport.connect()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user