diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py index e0f028e..23f4fbf 100644 --- a/IPython/core/interactiveshell.py +++ b/IPython/core/interactiveshell.py @@ -301,7 +301,7 @@ class InteractiveShell(Configurable, Magic): @property def db(self): return self.history_manager.shadow_db - + @classmethod def instance(cls, *args, **kwargs): """Returns a global InteractiveShell instance.""" @@ -1263,6 +1263,10 @@ class InteractiveShell(Configurable, Magic): finally: self.reload_history() return wrapper + + def get_history(self, index=None, raw=False, output=True): + return self.history_manager.get_history(index, raw, output) + #------------------------------------------------------------------------- # Things related to exception handling and tracebacks (not debugging) diff --git a/IPython/frontend/qt/console/ipython_widget.py b/IPython/frontend/qt/console/ipython_widget.py index b4741b8..432b3b3 100644 --- a/IPython/frontend/qt/console/ipython_widget.py +++ b/IPython/frontend/qt/console/ipython_widget.py @@ -184,8 +184,7 @@ class IPythonWidget(FrontendWidget): """ Reimplemented to make a history request. """ super(IPythonWidget, self)._started_channels() - # FIXME: Disabled until history requests are properly implemented. - #self.kernel_manager.xreq_channel.history(raw=True, output=False) + self.kernel_manager.xreq_channel.history(raw=True, output=False) #--------------------------------------------------------------------------- # 'ConsoleWidget' public interface