Upstream/aioesphomeapi
1
0
Fork 0
mirror of https://github.com/esphome/aioesphomeapi.git synced 2025-02-18 02:02:13 +01:00
Code Issues Projects Releases Wiki Activity

Fix bad except clauses order (#565)

Browse Source
This commit is contained in:
J. Nick Koston 2023-10-11 12:22:50 -10:00 committed by GitHub
parent d4b0919eab
commit 96a448b02c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aioesphomeapi/connection.py
View File

@ -304,10 +304,10 @@ class APIConnection:
coro = self._loop.sock_connect(self._socket, sockaddr) coro = self._loop.sock_connect(self._socket, sockaddr)
async with async_timeout.timeout(TCP_CONNECT_TIMEOUT): async with async_timeout.timeout(TCP_CONNECT_TIMEOUT):
await coro await coro
except OSError as err:
raise SocketAPIError(f"Error connecting to {sockaddr}: {err}") from err
except asyncio.TimeoutError as err: except asyncio.TimeoutError as err:
raise SocketAPIError(f"Timeout while connecting to {sockaddr}") from err raise SocketAPIError(f"Timeout while connecting to {sockaddr}") from err
except OSError as err:
raise SocketAPIError(f"Error connecting to {sockaddr}: {err}") from err
_LOGGER.debug( _LOGGER.debug(
"%s: Opened socket to %s:%s (%s)", "%s: Opened socket to %s:%s (%s)",
@ -350,10 +350,10 @@ class APIConnection:
self._set_connection_state(ConnectionState.SOCKET_OPENED) self._set_connection_state(ConnectionState.SOCKET_OPENED)
try: try:
await fh.perform_handshake(HANDSHAKE_TIMEOUT) await fh.perform_handshake(HANDSHAKE_TIMEOUT)
except OSError as err:
raise HandshakeAPIError(f"Handshake failed: {err}") from err
except asyncio.TimeoutError as err: except asyncio.TimeoutError as err:
raise TimeoutAPIError("Handshake timed out") from err raise TimeoutAPIError("Handshake timed out") from err
except OSError as err:
raise HandshakeAPIError(f"Handshake failed: {err}") from err
async def _connect_hello(self) -> None: async def _connect_hello(self) -> None:
"""Step 4 in connect process: send hello and get api version.""" """Step 4 in connect process: send hello and get api version."""