Skip to content

Commit 290e761

Browse files
committed
Simplify should_dispatch_immediately
1 parent 0ab59fc commit 290e761

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

ipykernel/inprocess/client.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,10 @@ def _dispatch_to_kernel(self, msg):
171171
raise RuntimeError('Cannot send request. No kernel exists.')
172172

173173
stream = kernel.shell_stream
174-
kernel.dispatch_shell(msg)
174+
self.session.send(stream, msg)
175+
msg_parts = stream.recv_multipart()
176+
kernel.dispatch_shell(msg_parts)
177+
175178
idents, reply_msg = self.session.recv(stream, copy=False)
176179
self.shell_channel.call_handlers_later(reply_msg)
177180

ipykernel/ipkernel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ def do_clear(self):
556556
self.shell.reset(False)
557557
return dict(status='ok')
558558

559-
def should_dispatch_immediately(self, msg, *args):
559+
def should_dispatch_immediately(self, msg):
560560
try:
561561
msg_type = msg['header']['msg_type']
562562
if msg_type in self.comm_msg_types:

ipykernel/kernelbase.py

+2-6
Original file line numberDiff line numberDiff line change
@@ -399,9 +399,7 @@ def dispatch_queue(self):
399399
def _message_counter_default(self):
400400
return itertools.count()
401401

402-
def should_dispatch_immediately(
403-
self, msg, idents, dispatch
404-
):
402+
def should_dispatch_immediately(self, msg):
405403
"""
406404
This provides a hook for dispatching incoming messages
407405
from the frontend immediately, and out of order.
@@ -423,9 +421,7 @@ def schedule_dispatch(self, msg, dispatch):
423421

424422
new_args = (msg, idents)
425423

426-
if self.should_dispatch_immediately(
427-
msg, idents, dispatch
428-
):
424+
if self.should_dispatch_immediately(msg):
429425
return self.io_loop.add_callback(dispatch, *new_args)
430426

431427
idx = next(self._message_counter)

0 commit comments

Comments
 (0)