Fix exec statements for Py 3

lib2to3.fixes.fix_exec

IPython/config/loader.py

@@ -478,7 +478,7 b' class CommandLineConfigLoader(ConfigLoader):'
             # This case happens if the rhs is a string.
             value = rhs
 
-        exec u'self.config.%s = value' % lhs
+        exec(u'self.config.%s = value' % lhs)
 
     def _load_flag(self, cfg):
         """update self.config from a flag, which can be a dict or Config"""
@@ -734,7 +734,7 b' class ArgParseConfigLoader(CommandLineConfigLoader):'
     def _convert_to_config(self):
         """self.parsed_data->self.config"""
         for k, v in vars(self.parsed_data).iteritems():
-            exec "self.config.%s = v"%k in locals(), globals()
+            exec("self.config.%s = v"%k, locals(), globals())
 
 class KVArgParseConfigLoader(ArgParseConfigLoader):
     """A config loader that loads aliases and flags with argparse,

IPython/config/tests/test_loader.py

@@ -256,7 +256,7 b' class TestConfig(TestCase):'
 
     def test_builtin(self):
         c1 = Config()
-        exec 'foo = True' in c1
+        exec('foo = True', c1)
         self.assertEqual(c1.foo, True)
         c1.format = "json"
     

IPython/core/interactiveshell.py

@@ -2461,7 +2461,7 b' class InteractiveShell(SingletonConfigurable):'
     def ex(self, cmd):
         """Execute a normal python statement in user namespace."""
         with self.builtin_trap:
-            exec cmd in self.user_global_ns, self.user_ns
+            exec(cmd, self.user_global_ns, self.user_ns)
 
     def ev(self, expr):
         """Evaluate python expression expr in user namespace.
@@ -2842,7 +2842,7 b' class InteractiveShell(SingletonConfigurable):'
             try:
                 self.hooks.pre_run_code_hook()
                 #rprint('Running code', repr(code_obj)) # dbg
-                exec code_obj in self.user_global_ns, self.user_ns
+                exec(code_obj, self.user_global_ns, self.user_ns)
             finally:
                 # Reset our crash handler in place
                 sys.excepthook = old_excepthook

IPython/core/magics/config.py

@@ -150,7 +150,7 b' class ConfigMagics(Magics):'
         # leave quotes on args when splitting, because we want
         # unquoted args to eval in user_ns
         cfg = Config()
-        exec "cfg."+line in locals(), self.shell.user_ns
+        exec("cfg."+line, locals(), self.shell.user_ns)
 
         for configurable in configurables:
             try:

IPython/core/magics/execution.py

@@ -977,7 +977,7 b' python-profiler package from non-free.""")'
         tc = clock()-t0
 
         ns = {}
-        exec code in self.shell.user_ns, ns
+        exec(code, self.shell.user_ns, ns)
         timer.inner = ns["inner"]
 
         if number == 0:
@@ -1100,7 +1100,7 b' python-profiler package from non-free.""")'
             end = clock2()
         else:
             st = clock2()
-            exec code in glob, local_ns
+            exec(code, glob, local_ns)
             end = clock2()
             out = None
         wall_end = wtime()

IPython/core/pylabtools.py

@@ -275,12 +275,12 b' def import_pylab(user_ns, import_all=True):'
           "np = numpy\n"
           "plt = pyplot\n"
           )
-    exec s in user_ns
+    exec(s, user_ns)
     
     if import_all:
         s = ("from matplotlib.pylab import *\n"
              "from numpy import *\n")
-        exec s in user_ns
+        exec(s, user_ns)
     
     # IPython symbols to add
     user_ns['figsize'] = figsize

IPython/core/tests/test_inputsplitter.py

@@ -366,7 +366,7 b' class InteractiveLoopTestCase(unittest.TestCase):'
         """
         src = mini_interactive_loop(pseudo_input(lines))
         test_ns = {}
-        exec src in test_ns
+        exec(src, test_ns)
         # We can't check that the provided ns is identical to the test_ns,
         # because Python fills test_ns with extra keys (copyright, etc).  But
         # we can check that the given dict is *contained* in test_ns

IPython/extensions/tests/test_autoreload.py

@@ -45,7 +45,7 b' class FakeShell(object):'
             self.auto_magics.pre_run_code_hook(self)
         except TryNext:
             pass
-        exec code in self.ns
+        exec(code, self.ns)
 
     def push(self, items):
         self.ns.update(items)

IPython/external/decorator/_decorator.py

@@ -161,7 +161,7 b' class FunctionMaker(object):'
         try:
             code = compile(src, '<string>', 'single')
             # print >> sys.stderr, 'Compiling %s' % src
-            exec code in evaldict
+            exec(code, evaldict)
         except:
             print('Error in generated code:', file=sys.stderr)
             print(src, file=sys.stderr)

IPython/kernel/zmq/ipkernel.py

@@ -596,7 +596,7 b' class Kernel(Configurable):'
             working.update(ns)
             code = "%s = %s(*%s,**%s)" % (resultname, fname, argname, kwargname)
             try:
-                exec code in shell.user_global_ns, shell.user_ns
+                exec(code, shell.user_global_ns, shell.user_ns)
                 result = working.get(resultname)
             finally:
                 for key in ns.iterkeys():

IPython/lib/demo.py

@@ -421,7 +421,7 b' class Demo(object):'
     def run_cell(self,source):
         """Execute a string with one or more lines of code"""
 
-        exec source in self.user_ns
+        exec(source, self.user_ns)
 
     def __call__(self,index=None):
         """run a block of the demo.

IPython/parallel/apps/ipcontrollerapp.py

@@ -482,7 +482,7 b' class IPControllerApp(BaseParallelApplication):'
         for s in statements:
             try:
                 self.log.msg("Executing statement: '%s'" % s)
-                exec s in globals(), locals()
+                exec(s, globals(), locals())
             except:
                 self.log.msg("Error running statement: %s" % s)
 

IPython/parallel/apps/ipengineapp.py

@@ -355,7 +355,7 b' class IPEngineApp(BaseParallelApplication):'
             try:
                 self.log.info("Initializing MPI:")
                 self.log.info(mpi_import_statement)
-                exec mpi_import_statement in globals()
+                exec(mpi_import_statement, globals())
             except:
                 mpi = None
         else:

IPython/parallel/controller/dependency.py

@@ -80,7 +80,7 b' def _require(*modules, **mapping):'
     user_ns = globals()
     for name in modules:
         try:
-            exec 'import %s' % name in user_ns
+            exec('import %s' % name, user_ns)
         except ImportError:
             raise UnmetDependency(name)
             

IPython/parallel/util.py

@@ -232,7 +232,7 b' def _push(**ns):'
     try:
         for name, value in ns.iteritems():
             user_ns[tmp] = value
-            exec "%s = %s" % (name, tmp) in user_ns
+            exec("%s = %s" % (name, tmp), user_ns)
     finally:
         user_ns.pop(tmp, None)
 
@@ -247,7 +247,7 b' def _pull(keys):'
 @interactive
 def _execute(code):
     """helper method for implementing `client.execute` via `client.apply`"""
-    exec code in globals()
+    exec(code, globals())
 
 #--------------------------------------------------------------------------
 # extra process management utilities

IPython/utils/py3compat.py

@@ -98,7 +98,7 b' if sys.version_info[0] >= 3:'
     def execfile(fname, glob, loc=None):
         loc = loc if (loc is not None) else glob
         with open(fname, 'rb') as f:
-            exec compile(f.read(), fname, 'exec') in glob, loc
+            exec(compile(f.read(), fname, 'exec'), glob, loc)
     
     # Refactor print statements in doctests.
     _print_statement_re = re.compile(r"\bprint (?P<expr>.*)$", re.MULTILINE)
@@ -196,7 +196,7 b' else:'
                 filename = unicode_to_str(fname)
             else:
                 filename = fname
-            exec compile(scripttext, filename, 'exec') in glob, loc
+            exec(compile(scripttext, filename, 'exec'), glob, loc)
     else:
         def execfile(fname, *where):
             if isinstance(fname, unicode):