From c316f6366f6900c6ce7124df18e6d33744ad8a2c Mon Sep 17 00:00:00 2001 From: Michael Oliver Date: Thu, 17 Nov 2022 15:05:21 +0000 Subject: [PATCH] Replace use of deprecated `socket.error` > `OSError` (#609) Co-authored-by: Tom Christie --- httpcore/backends/sync.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/httpcore/backends/sync.py b/httpcore/backends/sync.py index 18e1dd348..0fc445a95 100644 --- a/httpcore/backends/sync.py +++ b/httpcore/backends/sync.py @@ -20,7 +20,7 @@ def __init__(self, sock: socket.socket) -> None: self._sock = sock def read(self, max_bytes: int, timeout: typing.Optional[float] = None) -> bytes: - exc_map = {socket.timeout: ReadTimeout, socket.error: ReadError} + exc_map = {socket.timeout: ReadTimeout, OSError: ReadError} with map_exceptions(exc_map): self._sock.settimeout(timeout) return self._sock.recv(max_bytes) @@ -29,7 +29,7 @@ def write(self, buffer: bytes, timeout: typing.Optional[float] = None) -> None: if not buffer: return - exc_map = {socket.timeout: WriteTimeout, socket.error: WriteError} + exc_map = {socket.timeout: WriteTimeout, OSError: WriteError} with map_exceptions(exc_map): while buffer: self._sock.settimeout(timeout) @@ -45,7 +45,7 @@ def start_tls( server_hostname: typing.Optional[str] = None, timeout: typing.Optional[float] = None, ) -> NetworkStream: - exc_map = {socket.timeout: ConnectTimeout, socket.error: ConnectError} + exc_map = {socket.timeout: ConnectTimeout, OSError: ConnectError} with map_exceptions(exc_map): try: self._sock.settimeout(timeout) @@ -81,7 +81,7 @@ def connect_tcp( ) -> NetworkStream: address = (host, port) source_address = None if local_address is None else (local_address, 0) - exc_map = {socket.timeout: ConnectTimeout, socket.error: ConnectError} + exc_map = {socket.timeout: ConnectTimeout, OSError: ConnectError} with map_exceptions(exc_map): sock = socket.create_connection( address, timeout, source_address=source_address @@ -91,7 +91,7 @@ def connect_tcp( def connect_unix_socket( self, path: str, timeout: typing.Optional[float] = None ) -> NetworkStream: # pragma: nocover - exc_map = {socket.timeout: ConnectTimeout, socket.error: ConnectError} + exc_map = {socket.timeout: ConnectTimeout, OSError: ConnectError} with map_exceptions(exc_map): sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) sock.settimeout(timeout)