diff --git a/IPython/frontend/qt/console/ipython_widget.py b/IPython/frontend/qt/console/ipython_widget.py index d5b0ee1..fd6521f 100644 --- a/IPython/frontend/qt/console/ipython_widget.py +++ b/IPython/frontend/qt/console/ipython_widget.py @@ -91,7 +91,7 @@ class IPythonWidget(FrontendWidget): _PromptBlock = namedtuple('_PromptBlock', ['block', 'length', 'number']) _payload_source_edit = zmq_shell_source + '.edit_magic' _payload_source_exit = zmq_shell_source + '.ask_exit' - _payload_source_loadpy = zmq_shell_source + '.magic_loadpy' + _payload_source_next_input = zmq_shell_source + '.set_next_input' _payload_source_page = 'IPython.zmq.page.page' #--------------------------------------------------------------------------- @@ -107,7 +107,7 @@ class IPythonWidget(FrontendWidget): self._payload_source_edit : self._handle_payload_edit, self._payload_source_exit : self._handle_payload_exit, self._payload_source_page : self._handle_payload_page, - self._payload_source_loadpy : self._handle_payload_loadpy } + self._payload_source_next_input : self._handle_payload_next_input } self._previous_prompt_obj = None self._keep_kernel_on_exit = None @@ -459,9 +459,9 @@ class IPythonWidget(FrontendWidget): self._keep_kernel_on_exit = item['keepkernel'] self.exit_requested.emit() - def _handle_payload_loadpy(self, item): - # Simple save the text of the .py file for later. The text is written - # to the buffer when _prompt_started_hook is called. + def _handle_payload_next_input(self, item): + # Simply store the text for now. It is written to the buffer when + # _show_interpreter_prompt is called. self._code_to_load = item['text'] def _handle_payload_page(self, item): diff --git a/IPython/zmq/zmqshell.py b/IPython/zmq/zmqshell.py index 8793441..e7f1e00 100644 --- a/IPython/zmq/zmqshell.py +++ b/IPython/zmq/zmqshell.py @@ -592,9 +592,14 @@ class ZMQInteractiveShell(InteractiveShell): content = response.read() else: content = open(arg_s).read() + self.set_next_input(content) + + def set_next_input(self, text): + """Send the specified text to the frontend to be presented at the next + input cell.""" payload = dict( - source='IPython.zmq.zmqshell.ZMQInteractiveShell.magic_loadpy', - text=content + source='IPython.zmq.zmqshell.ZMQInteractiveShell.set_next_input', + text=text ) self.payload_manager.write_payload(payload)