From 69f870754c7d923d966097cde2986aa1cfc90e82 2010-01-10 02:34:39 From: Fernando Perez Date: 2010-01-10 02:34:39 Subject: [PATCH] Fix %history magics. Fixes: https://bugs.launchpad.net/ipython/+bug/505343 --- diff --git a/IPython/core/history.py b/IPython/core/history.py index 1a064cf..db08d1e 100644 --- a/IPython/core/history.py +++ b/IPython/core/history.py @@ -245,11 +245,10 @@ class ShadowHist(object): def init_ipython(ip): - # XXX - ipy_completers are in quarantine, need to be updated to new apis - #import ipy_completers - ip.define_magic("rep",rep_f) ip.define_magic("hist",magic_hist) ip.define_magic("history",magic_history) + # XXX - ipy_completers are in quarantine, need to be updated to new apis + #import ipy_completers #ipy_completers.quick_completer('%hist' ,'-g -t -r -n') diff --git a/IPython/core/iplib.py b/IPython/core/iplib.py index 065df5e..ceccebb 100644 --- a/IPython/core/iplib.py +++ b/IPython/core/iplib.py @@ -17,6 +17,7 @@ Main IPython Component #----------------------------------------------------------------------------- from __future__ import with_statement +from __future__ import absolute_import import __builtin__ import StringIO @@ -1582,6 +1583,9 @@ class InteractiveShell(Component, Magic): # Set user colors (don't do it in the constructor above so that it # doesn't crash if colors option is invalid) self.magic_colors(self.colors) + # History was moved to a separate module + from . import history + history.init_ipython(self) def magic(self,arg_s): """Call a magic function by name.