Update terminal-only magics to new API.

IPython/frontend/terminal/interactiveshell.py

@@ -14,22 +14,18 b''
 # Imports
 #-----------------------------------------------------------------------------
 
-import __builtin__
 import bdb
 import os
 import re
 import sys
 import textwrap
 
-try:
     from contextlib import nested
-except:
-    from IPython.utils.nested_context import nested
 
 from IPython.core.error import TryNext, UsageError
 from IPython.core.usage import interactive_usage, default_banner
 from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC
-from IPython.core.pylabtools import pylab_activate
+from IPython.core.magic import Magics, register_magics, line_magic
 from IPython.testing.skipdoctest import skip_doctest
 from IPython.utils.encoding import get_stream_enc
 from IPython.utils import py3compat
@@ -124,14 +120,19 b" def rerun_pasted(shell, name='pasted_block'):"
 # Terminal-specific magics
 #------------------------------------------------------------------------
 
-def magic_autoindent(self, parameter_s = ''):
+@register_magics
+class TerminalMagics(Magics):
+
+    @line_magic
+    def autoindent(self, parameter_s = ''):
     """Toggle autoindent on/off (if available)."""
 
     self.shell.set_autoindent()
     print "Automatic indentation is:",['OFF','ON'][self.shell.autoindent]
 
 @skip_doctest
-def magic_cpaste(self, parameter_s=''):
+    @line_magic
+    def cpaste(self, parameter_s=''):
     """Paste & execute a pre-formatted code block from clipboard.
 
     You must terminate the block with '--' (two minus-signs) or Ctrl-D
@@ -182,8 +183,8 b" def magic_cpaste(self, parameter_s=''):"
     block = strip_email_quotes(get_pasted_lines(sentinel))
     store_or_execute(self.shell, block, name)
 
-
-def magic_paste(self, parameter_s=''):
+    @line_magic
+    def paste(self, parameter_s=''):
     """Paste & execute a pre-formatted code block from clipboard.
 
     The text is pulled directly from the clipboard without user
@@ -239,10 +240,10 b" def magic_paste(self, parameter_s=''):"
 
     store_or_execute(self.shell, block, name)
 
-
 # Class-level: add a '%cls' magic only on Windows
 if sys.platform == 'win32':
-    def magic_cls(self, s):
+        @line_magic
+        def cls(self, s):
         """Clear screen.
         """
         os.system("cls")
@@ -664,15 +665,7 b' class TerminalInteractiveShell(InteractiveShell):'
 
     def init_magics(self):
         super(TerminalInteractiveShell, self).init_magics()
-        self.define_magic('autoindent', magic_autoindent)
-        self.define_magic('cpaste', magic_cpaste)
-        self.define_magic('paste', magic_paste)
-        try:
-            magic_cls
-        except NameError:
-            pass
-        else:
-            self.define_magic('cls', magic_cls)
+        self.register_magics(TerminalMagics)
 
     def showindentationerror(self):
         super(TerminalInteractiveShell, self).showindentationerror()