Merge lp:~ipython-dev/ipython/cpaste-fixes into lp:ipython/0.11

[Fernando Perez]

[Fernando Perez (fdo.perez)]

Fixes a bug (that was untested, added tests) and adds a useful feature to %paste.

This is very isolated, but we can merge it any time in the cycle that doesn't conflict with Brian's major work.

[lp:~ipython-dev/ipython/cpaste-fixes]

1210. By Fernando Perez on 2009-08-12

Make %paste echo by default, introduce -q for quiet mode.

[Brian Granger (ellisonbg)]

Looks good, I am going to go ahead and merge this.

review: Approve

[Fernando Perez (fdo.perez)]

On Thu, Aug 13, 2009 at 4:25 PM, Brian Granger<email address hidden> wrote:
> Review: Approve
> Looks good, I am going to go ahead and merge this.

Awesome if you do it: I'm swamped with last-minute things for scipy
and visitors who will go down to LA from here with us, so I'm a bit
short on time.

I will find a space to review your other branch though, so we don't
stall that. Promised.

Thanks!

f

=== modified file 'IPython/Magic.py'
--- IPython/Magic.py	2009-08-02 00:11:07 +0000
+++ IPython/Magic.py	2009-08-12 04:57:19 +0000
@@ -3381,8 +3381,13 @@
         You can also pass a variable name as an argument, e.g. '%paste foo'.
         This assigns the pasted block to variable 'foo' as string, without 
         dedenting or executing it (preceding >>> and + is still stripped)
+
+        Options
+        -------
         
-        '%paste -r' re-executes the block previously entered by cpaste.
+          -r: re-executes the block previously entered by cpaste.
+
+          -e: echo the pasted text back to the terminal.
         
         IPython statements (magics, shell escapes) are not supported (yet).
 
@@ -3390,7 +3395,7 @@
         --------
         cpaste: manually paste code into terminal until you mark its end.
         """
-        opts,args = self.parse_options(parameter_s,'r:',mode='string')
+        opts,args = self.parse_options(parameter_s,'re',mode='string')
         par = args.strip()
         if opts.has_key('r'):
             self._rerun_pasted()
@@ -3398,6 +3403,15 @@
 
         text = self.shell.hooks.clipboard_get()
         block = self._strip_pasted_lines_for_code(text.splitlines())
+
+        if opts.has_key('e'):
+            # Echo back to terminal.
+            write = self.shell.write
+            write(block)
+            if not block.endswith('\n'):
+                write('\n')
+            write("## -- End pasted text --\n")
+            
         self._execute_block(block, par)
 
     def magic_quickref(self,arg):

=== modified file 'IPython/tests/test_magic.py'
--- IPython/tests/test_magic.py	2009-08-04 10:12:31 +0000
+++ IPython/tests/test_magic.py	2009-08-12 04:57:19 +0000
@@ -7,6 +7,7 @@
 import sys
 import tempfile
 import types
+from cStringIO import StringIO
 
 import nose.tools as nt
 
@@ -261,9 +262,9 @@
 # Multiple tests for clipboard pasting
 def test_paste():
 
-    def paste(txt):
+    def paste(txt, flags=''):
         hooks.clipboard_get = lambda : txt
-        _ip.magic('paste')
+        _ip.magic('paste '+flags)
 
     # Inject fake clipboard hook but save original so we can restore it later
     hooks = _ip.IP.hooks
@@ -294,9 +295,31 @@
         """)
         yield (nt.assert_equal, user_ns['x'], [1,2,3])
         yield (nt.assert_equal, user_ns['y'], [1,4,9])
-    except:
-        pass
-
-    # This should be in a finally clause, instead of the bare except above.
-    # Restore original hook
-    hooks.clipboard_get = original_clip
+
+        # Now, test that paste -r works
+        user_ns.pop('x', None)
+        yield (nt.assert_false, 'x' in user_ns)
+        _ip.magic('paste -r')
+        yield (nt.assert_equal, user_ns['x'], [1,2,3])
+
+        # Also test paste -e, by temporarily faking the writer
+        w = StringIO()
+        writer = _ip.IP.write
+        _ip.IP.write = w.write
+        code = """
+        a = 100
+        b = 200"""
+        try:
+            paste(code,'-e')
+            out = w.getvalue()
+        finally:
+            _ip.IP.write = writer
+        yield (nt.assert_equal, user_ns['a'], 100)
+        yield (nt.assert_equal, user_ns['b'], 200)
+        yield (nt.assert_equal, out, code+"\n## -- End pasted text --\n")
+        
+    finally:
+        # This should be in a finally clause, instead of the bare except above.
+        # Restore original hook
+        hooks.clipboard_get = original_clip
+