From 52b58f94b7f33e33015d9d22d81e9837a5535f86 2013-03-24 15:03:38
From: Takafumi Arakaki <aka.tkf@gmail.com>
Date: 2013-03-24 15:03:38
Subject: [PATCH] Refactor ExecutionMagics._run_with_profiler

---

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 2f82eb3..d30fdd6 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -177,41 +177,15 @@ python-profiler package from non-free.""")
 
           In [1]: import profile; profile.help()
         """
-        return self._run_with_profiler(parameter_s, cell)
-
-    def _run_with_profiler(
-            self, parameter_s='', cell=None, user_mode=True,
-            opts=None, arg_lst=None, prog_ns=None, namespace=None):
-
-        opts_def = Struct(D=[''],l=[],s=['time'],T=[''])
-
-        if user_mode:  # regular user call
-            opts,arg_str = self.parse_options(parameter_s,'D:l:rs:T:q',
-                                              list_all=True, posix=False)
-            namespace = self.shell.user_ns
-            if cell is not None:
-                arg_str += '\n' + cell
-        elif namespace is not None:  # called to run a program by %run -p
-            arg_str = cell
-        else:
-            try:
-                filename = get_py_filename(arg_lst[0])
-            except IOError as e:
-                try:
-                    msg = str(e)
-                except UnicodeError:
-                    msg = e.message
-                error(msg)
-                return
+        opts, arg_str = self.parse_options(parameter_s, 'D:l:rs:T:q',
+                                           list_all=True, posix=False)
+        if cell is not None:
+            arg_str += '\n' + cell
+        return self._run_with_profiler(arg_str, opts, self.shell.user_ns)
 
-            arg_str = 'execfile(filename,prog_ns)'
-            namespace = {
-                'execfile': self.shell.safe_execfile,
-                'prog_ns': prog_ns,
-                'filename': filename
-                }
+    def _run_with_profiler(self, arg_str, opts, namespace):
 
-        opts.merge(opts_def)
+        opts.merge(Struct(D=[''], l=[], s=['time'], T=['']))
 
         prof = profile.Profile()
         try:
@@ -567,9 +541,7 @@ python-profiler package from non-free.""")
             stats = None
             with self.shell.readline_no_record:
                 if 'p' in opts:
-                    stats = self._run_with_profiler(
-                        cell=code, user_mode=False, opts=opts,
-                        namespace=code_ns)
+                    stats = self._run_with_profiler(code, opts, code_ns)
                 else:
                     if 'd' in opts:
                         self._run_with_debugger(