BUG: raw_input logic incorrect for in-process terminal frontend.

IPython/inprocess/blockingkernelmanager.py

@@ -19,6 +19,7 b' import Queue'
 from threading import Event
 
 # Local imports.
+from IPython.utils.io import raw_print
 from IPython.utils.traitlets import Type
 from kernelmanager import InProcessKernelManager, ShellInProcessChannel, \
     SubInProcessChannel, StdInInProcessChannel
@@ -65,7 +66,18 b' class BlockingSubInProcessChannel(BlockingChannelMixin, SubInProcessChannel):'
     pass
 
 class BlockingStdInInProcessChannel(BlockingChannelMixin, StdInInProcessChannel):
-    pass
+    
+    def call_handlers(self, msg):
+        """ Overridden for the in-process channel.
+
+        This methods simply calls raw_input directly.
+        """
+        msg_type = msg['header']['msg_type']
+        if msg_type == 'input_request':
+            raw_input = self.manager.kernel.sys_raw_input
+            prompt = msg['content']['prompt']
+            raw_print(prompt, end='')
+            self.input(raw_input())
 
 class BlockingInProcessKernelManager(InProcessKernelManager):
 

IPython/inprocess/tests/test_kernel.py

@@ -11,6 +11,8 b''
 from __future__ import print_function
 
 # Standard library imports
+from StringIO import StringIO
+import sys
 import unittest
 
 # Local imports
@@ -34,6 +36,21 b' class InProcessKernelTestCase(unittest.TestCase):'
         msg = get_stream_message(km)
         self.assert_('Welcome to pylab' in msg['content']['data'])
 
+    def test_raw_input(self):
+        """ Does the in-process kernel handle raw_input correctly?
+        """
+        km = BlockingInProcessKernelManager()
+        km.start_kernel()
+
+        io = StringIO('foobar\n')
+        sys_stdin = sys.stdin
+        sys.stdin = io
+        try:
+            km.shell_channel.execute('x = raw_input()')
+        finally:
+            sys.stdin = sys_stdin
+        self.assertEqual(km.kernel.shell.user_ns.get('x'), 'foobar')
+
     def test_stdout(self):
         """ Does the in-process kernel correctly capture IO?
         """

IPython/zmq/ipkernel.py

@@ -84,6 +84,7 b' class Kernel(Configurable):'
     control_stream = Instance(ZMQStream)
     iopub_socket = Instance(zmq.Socket)
     stdin_socket = Instance(zmq.Socket)
+    sys_raw_input = Any()
     log = Instance(logging.Logger)
     
     user_module = Any()
@@ -352,8 +353,10 b' class Kernel(Configurable):'
             raw_input = lambda prompt='' : self._no_raw_input()
 
         if py3compat.PY3:
+            self.sys_raw_input = __builtin__.input
             __builtin__.input = raw_input
         else:
+            self.sys_raw_input = __builtin__.raw_input
             __builtin__.raw_input = raw_input
 
         # Set the parent message of the display hook and out streams.
@@ -385,6 +388,12 b' class Kernel(Configurable):'
             reply_content.update(shell._showtraceback(etype, evalue, tb_list))
         else:
             status = u'ok'
+        finally:
+            # Restore raw_input.
+             if py3compat.PY3:
+                 __builtin__.input = self.sys_raw_input
+             else:
+                 __builtin__.raw_input = self.sys_raw_input
 
         reply_content[u'status'] = status