Update history magics to new API.

IPython/core/history.py

@@ -26,6 +26,7 b' import threading'
 
 # Our own packages
 from IPython.core.error import StdinNotImplementedError
+from IPython.core.magic import Magics, register_magics, line_magic
 from IPython.config.configurable import Configurable
 from IPython.external.decorator import decorator
 from IPython.testing.skipdoctest import skip_doctest
@@ -74,13 +75,13 b' class HistoryAccessor(Configurable):'
     hist_file = Unicode(config=True,
         help="""Path to file to use for SQLite history database.
         
-        By default, IPython will put the history database in the IPython profile
-        directory.  If you would rather share one history among profiles,
-        you ca set this value in each, so that they are consistent.
+        By default, IPython will put the history database in the IPython
+        profile directory.  If you would rather share one history among
+        profiles, you ca set this value in each, so that they are consistent.
         
-        Due to an issue with fcntl, SQLite is known to misbehave on some NFS mounts.
-        If you see IPython hanging, try setting this to something on a local disk,
-        e.g::
+        Due to an issue with fcntl, SQLite is known to misbehave on some NFS
+        mounts.  If you see IPython hanging, try setting this to something on a
+        local disk, e.g::
         
             ipython --HistoryManager.hist_file=/tmp/ipython_hist.sqlite
         
@@ -153,7 +154,8 b' class HistoryAccessor(Configurable):'
     def init_db(self):
         """Connect to the database, and create tables if necessary."""
         # use detect_types so that timestamps return datetime objects
-        self.db = sqlite3.connect(self.hist_file, detect_types=sqlite3.PARSE_DECLTYPES|sqlite3.PARSE_COLNAMES)
+        self.db = sqlite3.connect(self.hist_file,
+                    detect_types=sqlite3.PARSE_DECLTYPES|sqlite3.PARSE_COLNAMES)
         self.db.execute("""CREATE TABLE IF NOT EXISTS sessions (session integer
                         primary key autoincrement, start timestamp,
                         end timestamp, num_cmds integer, remark text)""")
@@ -216,7 +218,8 b' class HistoryAccessor(Configurable):'
         Returns
         -------
 
-        (session_id [int], start [datetime], end [datetime], num_cmds [int], remark [unicode])
+        (session_id [int], start [datetime], end [datetime], num_cmds [int],
+        remark [unicode])
 
         Sessions that are running or did not exit cleanly will have `end=None`
         and `num_cmds=None`.
@@ -512,7 +515,8 b' class HistoryManager(HistoryAccessor):'
             session += self.session_number
         if session==self.session_number:          # Current session
             return self._get_range_session(start, stop, raw, output)
-        return super(HistoryManager, self).get_range(session, start, stop, raw, output)
+        return super(HistoryManager, self).get_range(session, start, stop, raw,
+                                                     output)
 
     ## ----------------------------
     ## Methods for storing history:
@@ -611,7 +615,9 b' class HistoryManager(HistoryAccessor):'
                 print("ERROR! Session/line number was not unique in",
                       "database. History logging moved to new session",
                                                 self.session_number)
-                try: # Try writing to the new session. If this fails, don't recurse
+                try:
+                    # Try writing to the new session. If this fails, don't
+                    # recurse
                     self._writeout_input_cache(conn)
                 except sqlite3.IntegrityError:
                     pass
@@ -718,8 +724,12 b' def _format_lineno(session, line):'
     return "%s#%s" % (session, line)
 
 
+@register_magics
+class HistoryMagics(Magics):
+
 @skip_doctest
-def magic_history(self, parameter_s = ''):
+    @line_magic
+    def history(self, parameter_s = ''):
     """Print input history (_i<n> variables), with most recent last.
 
     %history [-o -p -t -n] [-f filename] [range | -g pattern | -l number]
@@ -746,31 +756,33 b" def magic_history(self, parameter_s = ''):"
 
       -o: also print outputs for each input.
 
-      -p: print classic '>>>' python prompts before each input.  This is useful
-       for making documentation, and in conjunction with -o, for producing
-       doctest-ready output.
+          -p: print classic '>>>' python prompts before each input.  This is
+           useful for making documentation, and in conjunction with -o, for
+           producing doctest-ready output.
 
-      -r: (default) print the 'raw' history, i.e. the actual commands you typed.
+          -r: (default) print the 'raw' history, i.e. the actual commands you
+           typed.
 
-      -t: print the 'translated' history, as IPython understands it.  IPython
-      filters your input and converts it all into valid Python source before
-      executing it (things like magics or aliases are turned into function
-      calls, for example). With this option, you'll see the native history
-      instead of the user-entered version: '%cd /' will be seen as
-      'get_ipython().magic("%cd /")' instead of '%cd /'.
+          -t: print the 'translated' history, as IPython understands it.
+          IPython filters your input and converts it all into valid Python
+          source before executing it (things like magics or aliases are turned
+          into function calls, for example). With this option, you'll see the
+          native history instead of the user-entered version: '%cd /' will be
+          seen as 'get_ipython().magic("%cd /")' instead of '%cd /'.
 
       -g: treat the arg as a pattern to grep for in (full) history.
       This includes the saved history (almost all commands ever written).
       Use '%hist -g' to show full saved history (may be very long).
 
-      -l: get the last n lines from all sessions. Specify n as a single arg, or
-      the default is the last 10 lines.
+          -l: get the last n lines from all sessions. Specify n as a single
+          arg, or the default is the last 10 lines.
 
-      -f FILENAME: instead of printing the output to the screen, redirect it to
-       the given file.  The file is always overwritten, though *when it can*,
-       IPython asks for confirmation first. In particular, running the command
-       "history -f FILENAME" from the IPython Notebook interface will replace
-       FILENAME even if it already exists *without* confirmation.
+          -f FILENAME: instead of printing the output to the screen, redirect
+           it to the given file.  The file is always overwritten, though *when
+           it can*, IPython asks for confirmation first. In particular, running
+           the command 'history -f FILENAME' from the IPython Notebook
+           interface will replace FILENAME even if it already exists *without*
+           confirmation.
 
     Examples
     --------
@@ -784,7 +796,8 b" def magic_history(self, parameter_s = ''):"
     """
 
     if not self.shell.displayhook.do_full_cache:
-        print('This feature is only available if numbered prompts are in use.')
+            print('This feature is only available if numbered prompts '
+                  'are in use.')
         return
     opts,args = self.parse_options(parameter_s,'noprtglf:',mode='string')
 
@@ -823,7 +836,6 b" def magic_history(self, parameter_s = ''):"
     # Raw history is the default
     raw = not('t' in opts)
 
-    default_length = 40
     pattern = None
 
     if 'g' in opts:         # Glob search
@@ -833,7 +845,7 b" def magic_history(self, parameter_s = ''):"
     elif 'l' in opts:       # Get 'tail'
         try:
             n = int(args)
-        except ValueError, IndexError:
+            except (ValueError, IndexError):
             n = 10
         hist = history_manager.get_tail(n, raw=raw, output=get_output)
     else:
@@ -842,14 +854,16 b" def magic_history(self, parameter_s = ''):"
         else:               # Just get history for the current session
             hist = history_manager.get_range(raw=raw, output=get_output)
 
-    # We could be displaying the entire history, so let's not try to pull it
-    # into a list in memory. Anything that needs more space will just misalign.
+        # We could be displaying the entire history, so let's not try to pull
+        # it into a list in memory. Anything that needs more space will just
+        # misalign.
     width = 4
 
     for session, lineno, inline in hist:
-        # Print user history with tabs expanded to 4 spaces.  The GUI clients
-        # use hard tabs for easier usability in auto-indented code, but we want
-        # to produce PEP-8 compliant history for safe pasting into an editor.
+            # Print user history with tabs expanded to 4 spaces.  The GUI
+            # clients use hard tabs for easier usability in auto-indented code,
+            # but we want to produce PEP-8 compliant history for safe pasting
+            # into an editor.
         if get_output:
             inline, output = inline
         inline = inline.expandtabs(4).rstrip()
@@ -870,17 +884,17 b" def magic_history(self, parameter_s = ''):"
     if close_at_end:
         outfile.close()
 
-
-def magic_rep(self, arg):
+    @line_magic
+    def rep(self, arg):
     r"""Repeat a command, or get command to input line for editing.
     
     %recall and %rep are equivalent.
 
     - %recall (no arguments):
 
-    Place a string version of last computation result (stored in the special '_'
-    variable) to the next input prompt. Allows you to create elaborate command
-    lines without using copy-paste::
+        Place a string version of last computation result (stored in the
+        special '_' variable) to the next input prompt. Allows you to create
+        elaborate command lines without using copy-paste::
 
          In[1]: l = ["hei", "vaan"]
          In[2]: "".join(l)
@@ -928,8 +942,8 b' def magic_rep(self, arg):'
         self.shell.set_next_input(cmd.rstrip())
     print("Couldn't evaluate or find in history:", arg)
 
-
-def magic_rerun(self, parameter_s=''):
+    @line_magic
+    def rerun(self, parameter_s=''):
     """Re-run previous input
 
     By default, you can specify ranges of input history to be repeated
@@ -971,11 +985,9 b" def magic_rerun(self, parameter_s=''):"
 
 
 def init_ipython(ip):
-    ip.define_magic("rep", magic_rep)
-    ip.define_magic("recall", magic_rep)
-    ip.define_magic("rerun", magic_rerun)
-    ip.define_magic("hist", magic_history)    # Alternative name
-    ip.define_magic("history", magic_history)
+    ip.magics_manager.register(HistoryMagics)
+    #ip.define_magic('hist', HistoryMagics.history)
+    #ip.define_magic('recall', HistoryMagics.rep)
 
     # XXX - ipy_completers are in quarantine, need to be updated to new apis
     #import ipy_completers