From 45ee38a979708a3e0e817f9286027e8a7b140e6e Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Thu, 2 Dec 2021 11:34:39 +0000 Subject: [PATCH] RF: Handle both asyncio.QueueEmpty and tornado.queues.QueueEmpty --- ipykernel/kernelbase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ipykernel/kernelbase.py b/ipykernel/kernelbase.py index a0a7c98e2..39d6d2661 100644 --- a/ipykernel/kernelbase.py +++ b/ipykernel/kernelbase.py @@ -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 @@ -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)