Skip to content

Fix asyncio messages handling for CancelledError. #1774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pseiderer wants to merge 1 commit into from
Closed

Fix asyncio messages handling for CancelledError. #1774

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions src/websockets/asyncio/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import codecs
import collections
from collections.abc import AsyncIterator, Iterable
from typing import Any, Callable, Generic, Literal, TypeVar, overload
from typing import Any, Callable, Generic, List, Literal, TypeVar, overload

from ..exceptions import ConcurrencyError
from ..frames import BINARY, CONT, TEXT, Frame
Expand Down Expand Up @@ -54,10 +54,11 @@ async def get(self, block: bool = True) -> T:
self.get_waiter = None
return self.queue.popleft()

def reset(self, items: Iterable[T]) -> None:
"""Put back items into an empty, idle queue."""
def reset(self, items: List[T]) -> None:
"""Put back items into the idle queue."""
assert self.get_waiter is None, "cannot reset() while get() is running"
assert not self.queue, "cannot reset() while queue isn't empty"
items.extend(self.queue)
self.queue.clear()
self.queue.extend(items)

def abort(self) -> None:
Expand Down