Fix history (was accessing directly shell methods)

IPython/core/history.py

@@ -54,6 +54,7 b' class DummyDB(object):'
     def __exit__(self, *args, **kwargs):
         pass
     
+
 @decorator
 def needs_sqlite(f,*a,**kw):
     """return an empty list in the absence of sqlite"""
@@ -62,6 +63,7 b' def needs_sqlite(f,*a,**kw):'
     else:
         return f(*a,**kw)
 
+
 class HistoryAccessor(Configurable):
     """Access the history database without adding to it.
     
@@ -84,7 +86,6 b' class HistoryAccessor(Configurable):'
         
         """)
 
-
     # The SQLite database
     if sqlite3:
         db = Instance(sqlite3.Connection)
@@ -676,6 +677,7 b' range_re = re.compile(r"""'
  (?P<end>\d+))?
 $""", re.VERBOSE)
 
+
 def extract_hist_ranges(ranges_str):
     """Turn a string of history ranges into 3-tuples of (session, start, stop).
 
@@ -708,12 +710,14 b' def extract_hist_ranges(ranges_str):'
             yield (sess, 1, None)
         yield (endsess, 1, end)
 
+
 def _format_lineno(session, line):
     """Helper function to format line numbers properly."""
     if session == 0:
         return str(line)
     return "%s#%s" % (session, line)
 
+
 @skip_doctest
 def magic_history(self, parameter_s = ''):
     """Print input history (_i<n> variables), with most recent last.
@@ -902,13 +906,13 b' def magic_rep(self, arg):'
     placed at the next input prompt.
     """
     if not arg:                 # Last output
-        self.set_next_input(str(self.shell.user_ns["_"]))
+        self.shell.set_next_input(str(self.shell.user_ns["_"]))
         return
                                 # Get history range
     histlines = self.history_manager.get_range_by_str(arg)
     cmd = "\n".join(x[2] for x in histlines)
     if cmd:
-        self.set_next_input(cmd.rstrip())
+        self.shell.set_next_input(cmd.rstrip())
         return
 
     try:                        # Variable in user namespace
@@ -918,10 +922,10 b' def magic_rep(self, arg):'
         for h in reversed([x[2] for x in histlines]):
             if 'rep' in h:
                 continue
-            self.set_next_input(h.rstrip())
+            self.shell.set_next_input(h.rstrip())
             return
     else:
-        self.set_next_input(cmd.rstrip())
+        self.shell.set_next_input(cmd.rstrip())
     print("Couldn't evaluate or find in history:", arg)
 
 

IPython/core/interactiveshell.py

@@ -2053,7 +2053,7 b' class InteractiveShell(SingletonConfigurable):'
 
           ip.define_magic('foo',foo_impl)
         """
-        im = types.MethodType(func,self)
+        im = types.MethodType(func, self._magic)
         old = self.find_magic(magic_name)
         setattr(self._magic, 'magic_' + magic_name, im)
         return old