From b259affc210da9a1c6a395bc7b55e58db035a27d 2015-05-31 21:59:13 From: Tianhui Michael Li Date: 2015-05-31 21:59:13 Subject: [PATCH] flipping order of charges in safe_exefile_ipy --- diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py index e422584..e19c5d9 100644 --- a/IPython/core/interactiveshell.py +++ b/IPython/core/interactiveshell.py @@ -2664,7 +2664,7 @@ class InteractiveShell(SingletonConfigurable): # tb offset is 2 because we wrap execfile self.showtraceback(tb_offset=2) - def safe_execfile_ipy(self, fname, raise_exceptions=False, shell_futures=False): + def safe_execfile_ipy(self, fname, shell_futures=False, raise_exceptions=False): """Like safe_execfile, but for .ipy or .ipynb files with IPython syntax. Parameters @@ -2672,13 +2672,13 @@ class InteractiveShell(SingletonConfigurable): fname : str The name of the file to execute. The filename must have a .ipy or .ipynb extension. - raise_exceptions : bool (False) - If True raise exceptions everywhere. Meant for testing. shell_futures : bool (False) If True, the code will share future statements with the interactive shell. It will both be affected by previous __future__ imports, and any __future__ imports in the code will affect the shell. If False, __future__ imports are not shared in either direction. + raise_exceptions : bool (False) + If True raise exceptions everywhere. Meant for testing. """ fname = os.path.abspath(os.path.expanduser(fname))