Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions asyncpg/compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,8 @@ async def wait_for(fut, timeout):

try:
return await asyncio.wait_for(fut, timeout)
except asyncio.CancelledError:
if fut.done():
except (asyncio.CancelledError, asyncio.TimeoutError):
if fut.done() and not fut.cancelled():
return fut.result()
else:
raise