Merge pull request #1831 from steverweber/fix_1814

set `__file__` when running .ipy files

closes  #1814

IPython/core/interactiveshell.py

@@ -2448,6 +2448,9 b' class InteractiveShell(SingletonConfigurable):'
         dname = os.path.dirname(fname)
 
         with prepended_to_syspath(dname):
+            # Ensure that __file__ is always defined to match Python behavior
+            save_fname = self.user_ns.get('__file__',None)
+            self.user_ns['__file__'] = fname
             try:
                 py3compat.execfile(fname,*where)
             except SystemExit as status:
@@ -2468,6 +2471,8 b' class InteractiveShell(SingletonConfigurable):'
                 if kw['raise_exceptions']:
                     raise
                 self.showtraceback()
+            finally:
+                self.user_ns['__file__'] = save_fname
 
     def safe_execfile_ipy(self, fname):
         """Like safe_execfile, but for .ipy files with IPython syntax.
@@ -2494,6 +2499,9 b' class InteractiveShell(SingletonConfigurable):'
         dname = os.path.dirname(fname)
 
         with prepended_to_syspath(dname):
+            # Ensure that __file__ is always defined to match Python behavior
+            save_fname = self.user_ns.get('__file__',None)
+            self.user_ns['__file__'] = fname
             try:
                 with open(fname) as thefile:
                     # self.run_cell currently captures all exceptions
@@ -2504,6 +2512,8 b' class InteractiveShell(SingletonConfigurable):'
             except:
                 self.showtraceback()
                 warn('Unknown failure executing file: <%s>' % fname)
+            finally:
+                self.user_ns['__file__'] = save_fname
 
     def safe_run_module(self, mod_name, where):
         """A safe version of runpy.run_module().

IPython/core/shellapp.py

@@ -277,20 +277,12 b' class InteractiveShellApp(Configurable):'
             sys.argv = [ py3compat.cast_bytes(a) for a in sys.argv ]
         try:
             if os.path.isfile(full_filename):
+                self.log.info("Running file in user namespace: %s" % full_filename)
                 if full_filename.endswith('.ipy'):
-                    self.log.info("Running file in user namespace: %s" %
-                                  full_filename)
                     self.shell.safe_execfile_ipy(full_filename)
                 else:
                     # default to python, even without extension
-                    self.log.info("Running file in user namespace: %s" %
-                                  full_filename)
-                    # Ensure that __file__ is always defined to match Python behavior
-                    self.shell.user_ns['__file__'] = fname
-                    try:
-                        self.shell.safe_execfile(full_filename, self.shell.user_ns)
-                    finally:
-                        del self.shell.user_ns['__file__']
+                    self.shell.safe_execfile(full_filename, self.shell.user_ns)
         finally:
             sys.argv = save_argv