Merge pull request #817 from pauldmccarthy/rf/queueempty-exception

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

Author: blink1073

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)