Merge pull request #437 from Chilipp/master

Moved InProcessKernelClient.flush to DummySocket

Author: blink1073

ipykernel/inprocess/client.py

@@ -172,9 +172,6 @@ def _dispatch_to_kernel(self, msg):
         idents, reply_msg = self.session.recv(stream, copy=False)
         self.shell_channel.call_handlers_later(reply_msg)
 
-    def flush(self):
-        """no-op to comply with stream API"""
-
 
 #-----------------------------------------------------------------------------
 # ABC Registration

ipykernel/inprocess/socket.py

@@ -61,4 +61,8 @@ def send_multipart(self, msg_parts, flags=0, copy=True, track=False):
         self.queue.put_nowait(msg_parts)
         self.message_sent += 1
 
+    def flush(self, timeout=1.0):
+        """no-op to comply with stream API"""
+        pass
+
 SocketABC.register(DummySocket)