Skip to content

RF: Handle both asyncio.QueueEmpty and tornado.queues.QueueEmpty #817

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

Merged
blink1073 merged 1 commit into from
Dec 2, 2021
Merged

RF: Handle both asyncio.QueueEmpty and tornado.queues.QueueEmpty #817

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
4 changes: 2 additions & 2 deletions ipykernel/kernelbase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
now = datetime.now

from tornado import ioloop
from tornado.queues import Queue
from tornado.queues import Queue, QueueEmpty
import zmq
from zmq.eventloop.zmqstream import ZMQStream

Expand Down Expand Up @@ -441,7 +441,7 @@ async def process_one(self, wait=True):
else:
try:
t, dispatch, args = self.msg_queue.get_nowait()
except asyncio.QueueEmpty:
except (asyncio.QueueEmpty, QueueEmpty):
return None
await dispatch(*args)

Expand Down