Refactor paste magics and ipdoctest

IPython/core/tests/test_magic_terminal.py

@@ -48,7 +48,7 b' def check_cpaste(code, should_fail=False):'
                 ip.magic('cpaste')
 
         if not should_fail:
-            assert ip.user_ns['code_ran']
+            assert ip.user_ns['code_ran'], "%r failed" % code
     finally:
         sys.stdin = stdin_save
 
@@ -130,6 +130,7 b' class PasteTestCase(TestCase):'
 
     def test_paste_py_multi_r(self):
         "Now, test that self.paste -r works"
+        self.test_paste_py_multi()
         nt.assert_equal(ip.user_ns.pop('x'), [1,2,3])
         nt.assert_equal(ip.user_ns.pop('y'), [1,4,9])
         nt.assert_false('x' in ip.user_ns)

IPython/frontend/terminal/interactiveshell.py

@@ -84,69 +84,6 b' class TerminalMagics(Magics):'
         super(TerminalMagics, self).__init__(shell)
         self.input_splitter = IPythonInputSplitter()
 
-    def cleanup_input(self, block):
-        """Apply all possible IPython cleanups to an input block.
-
-        This means:
-
-        - remove any global leading whitespace (dedent)
-        - remove any email quotes ('>') if they are present in *all* lines
-        - apply all static inputsplitter transforms and break into sub-blocks
-        - apply prefilter() to each sub-block that is a single line.
-
-        Parameters
-        ----------
-        block : str
-          A possibly multiline input string of code.
-
-        Returns
-        -------
-        transformed block : str
-          The input, with all transformations above applied.
-        """
-        # We have to effectively implement client-side the loop that is done by
-        # the terminal frontend, and furthermore do it on a block that can
-        # possibly contain multiple statments pasted in one go.
-
-        # First, run the input through the block splitting code.  We should
-        # eventually make this a self-contained method in the inputsplitter.
-        isp = self.input_splitter
-        isp.reset()
-        b = textwrap.dedent(block)
-
-        # Remove email quotes first.  These must be consistently applied to
-        # *all* lines to be removed
-        b = strip_email_quotes(b)
-
-        # Split the input into independent sub-blocks so we can later do
-        # prefiltering (which must be done *only* to single-line inputs)
-        blocks = []
-        last_block = []
-        for line in b.splitlines():
-            isp.push(line)
-            last_block.append(line)
-            if not isp.push_accepts_more():
-                blocks.append(isp.source_reset())
-                last_block = []
-        if last_block:
-            blocks.append('\n'.join(last_block))
-
-        # Now, apply prefiltering to any one-line block to match the behavior
-        # of the interactive terminal
-        final_blocks = []
-        for block in blocks:
-            lines = block.splitlines()
-            if len(lines) == 1:
-                final_blocks.append(self.shell.prefilter(lines[0]))
-            else:
-                final_blocks.append(block)
-
-        # We now have the final version of the input code as a list of blocks,
-        # with all inputsplitter transformations applied and single-line blocks
-        # run through prefilter.  For further processing, turn into a single
-        # string as the rest of our apis use string inputs.
-        return '\n'.join(final_blocks)
-        
     def store_or_execute(self, block, name):
         """ Execute a block, or store it in a variable, per the user's request.
         """
@@ -155,14 +92,20 b' class TerminalMagics(Magics):'
             self.shell.user_ns[name] = SList(block.splitlines())
             print("Block assigned to '%s'" % name)
         else:
-            self.shell.user_ns['pasted_block'] = block
-            b = self.shell.input_transformer_manager.transform_cell(block)
+            b = self.preclean_input(block)
+            self.shell.user_ns['pasted_block'] = b
             self.shell.using_paste_magics = True
             try:
                 self.shell.run_cell(b)
             finally:
                 self.shell.using_paste_magics = False
 
+    def preclean_input(self, block):
+        lines = block.splitlines()
+        while lines and not lines[0].strip():
+            lines = lines[1:]
+        return strip_email_quotes('\n'.join(lines))
+
     def rerun_pasted(self, name='pasted_block'):
         """ Rerun a previously pasted command.
         """

IPython/testing/plugin/ipdoctest.py

@@ -49,10 +49,6 b' from nose.util import anyp, getpackage, test_address, resolve_name, tolist'
 
 # Our own imports
 
-# We're temporarily using TerminalMagics.cleanup_input() until the functionality
-# is moved into core.
-from IPython.frontend.terminal.interactiveshell import TerminalMagics
-
 #-----------------------------------------------------------------------------
 # Module globals and other constants
 #-----------------------------------------------------------------------------
@@ -386,7 +382,11 b' class IPDocTestParser(doctest.DocTestParser):'
 
     def ip2py(self,source):
         """Convert input IPython source into valid Python."""
-        return TerminalMagics(_ip).cleanup_input(source)
+        block = _ip.input_transformer_manager.transform_cell(source)
+        if len(block.splitlines()) == 1:
+            return _ip.prefilter(block)
+        else:
+            return block
 
     def parse(self, string, name='<string>'):
         """