diff --git a/IPython/frontend/qt/console/ipython_widget.py b/IPython/frontend/qt/console/ipython_widget.py index 6140776..d5b0ee1 100644 --- a/IPython/frontend/qt/console/ipython_widget.py +++ b/IPython/frontend/qt/console/ipython_widget.py @@ -160,7 +160,7 @@ class IPythonWidget(FrontendWidget): else: super(IPythonWidget, self)._handle_execute_reply(msg) - def _handle_history_tail_reply(self, msg): + def _handle_history_reply(self, msg): """ Implemented to handle history tail replies, which are only supported by the IPython kernel. """ diff --git a/IPython/frontend/qt/kernelmanager.py b/IPython/frontend/qt/kernelmanager.py index c47b489..5e362bd 100644 --- a/IPython/frontend/qt/kernelmanager.py +++ b/IPython/frontend/qt/kernelmanager.py @@ -46,7 +46,7 @@ class QtXReqSocketChannel(SocketChannelQObject, XReqSocketChannel): execute_reply = QtCore.Signal(object) complete_reply = QtCore.Signal(object) object_info_reply = QtCore.Signal(object) - history_tail_reply = QtCore.Signal(object) + history_reply = QtCore.Signal(object) # Emitted when the first reply comes back. first_reply = QtCore.Signal() diff --git a/IPython/zmq/ipkernel.py b/IPython/zmq/ipkernel.py index 4744003..527b127 100755 --- a/IPython/zmq/ipkernel.py +++ b/IPython/zmq/ipkernel.py @@ -348,7 +348,7 @@ class Kernel(Configurable): else: hist = [] content = {'history' : list(hist)} - msg = self.session.send(self.reply_socket, 'history_tail_reply', + msg = self.session.send(self.reply_socket, 'history_reply', content, parent, ident) logger.debug(str(msg))