move code to Kernel

Author: Quentin Peter

ipykernel/kernelapp.py

@@ -433,7 +433,6 @@ def init_kernel(self):
         """Create the Kernel object itself"""
         shell_stream = ZMQStream(self.shell_socket)
         control_stream = ZMQStream(self.control_socket)
-        stdin_stream = ZMQStream(self.stdin_socket)
 
         kernel_factory = self.kernel_class.instance
 
@@ -447,18 +446,7 @@ def init_kernel(self):
                                 profile_dir=self.profile_dir,
                                 user_ns=self.user_ns,
         )
-        kernel.stdin_stream = stdin_stream
 
-        def handle_msg(msg):
-            idents, msg = self.session.feed_identities(msg, copy=False)
-            try:
-                msg = self.session.deserialize(msg, content=True, copy=False)
-            except:
-                self.log.error("Invalid Message", exc_info=True)
-                return
-            kernel._stdin_msg = msg
-
-        kernel.stdin_stream.on_recv(handle_msg, copy=False)
         kernel.record_ports({
             name + '_port': port for name, port in self.ports.items()
         })

ipykernel/kernelbase.py

@@ -42,7 +42,6 @@
 
 from ._version import kernel_protocol_version
 
-
 CONTROL_PRIORITY = 1
 SHELL_PRIORITY = 10
 ABORT_PRIORITY = 20
@@ -174,6 +173,18 @@ def __init__(self, **kwargs):
 
         self._stdin_msg = None
         self._stdin_lock = threading.Lock()
+        self.stdin_stream = ZMQStream(self.stdin_socket)
+
+        def handle_msg(msg):
+            idents, msg = self.session.feed_identities(msg, copy=False)
+            try:
+                msg = self.session.deserialize(msg, content=True, copy=False)
+            except Exception:
+                self.log.error("Invalid Message", exc_info=True)
+                return
+            self._stdin_msg = msg
+
+        self.stdin_stream.on_recv(handle_msg, copy=False)
 
     @gen.coroutine
     def dispatch_control(self, msg):