Merge branch 'takluyver-magic-local-scope'

IPython/core/interactiveshell.py

@@ -22,6 +22,7 b' import __future__'
 import abc
 import atexit
 import codeop
+import inspect
 import os
 import re
 import sys
@@ -1740,9 +1741,14 b' class InteractiveShell(Configurable, Magic):'
             error("Magic function `%s` not found." % magic_name)
         else:
             magic_args = self.var_expand(magic_args,1)
+            # Grab local namespace if we need it:
+            if getattr(fn, "needs_local_scope", False):
+                self._magic_locals = sys._getframe(1).f_locals
             with nested(self.builtin_trap,):
                 result = fn(magic_args)
-                return result
+            # Ensure we're not keeping object references around:
+            self._magic_locals = {}
+            return result
 
     def define_magic(self, magicname, func):
         """Expose own function as magic function for ipython 

IPython/core/magic.py

@@ -85,6 +85,10 b' def compress_dhist(dh):'
 
     return newhead + tail        
 
+def needs_local_scope(func):
+    """Decorator to mark magic functions which need to local scope to run."""
+    func.needs_local_scope = True
+    return func
 
 #***************************************************************************
 # Main class implementing Magic functionality
@@ -1863,6 +1867,7 b' Currently the magic system has the following functions:\\n"""'
             print "Compiler time: %.2f s" % tc
 
     @testdec.skip_doctest
+    @needs_local_scope
     def magic_time(self,parameter_s = ''):
         """Time execution of a Python statement or expression.
 
@@ -1928,17 +1933,18 b' Currently the magic system has the following functions:\\n"""'
             tc = clock()-t0
         # skew measurement as little as possible
         glob = self.shell.user_ns
+        locs = self._magic_locals
         clk = clock2
         wtime = time.time
         # time execution
         wall_st = wtime()
         if mode=='eval':
             st = clk()
-            out = eval(code,glob)
+            out = eval(code, glob, locs)
             end = clk()
         else:
             st = clk()
-            exec code in glob
+            exec code in glob, locs
             end = clk()
             out = None
         wall_end = wtime()

IPython/core/tests/test_magic.py

@@ -274,6 +274,14 b' def doctest_time():'
     In [10]: %time None
     CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
     Wall time: 0.00 s
+    
+    In [11]: def f(kmjy):
+       ....:    %time print 2*kmjy
+       
+    In [12]: f(3)
+    6
+    CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
+    Wall time: 0.00 s
     """