Revert "Merge pull request #1831 from steverweber/fix_1814"

This reverts commit 2717febad3ccc64ff8f6d212c70cd73d1fb1e1a0, reversing
changes made to ea4f608cc27db0de063ed6f40593ec83db171b8c.

IPython/core/interactiveshell.py

@@ -2455,9 +2455,6 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:
@@ -2478,8 +2475,6 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.
@@ -2506,9 +2501,6 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
@@ -2519,8 +2511,6 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,13 +277,21 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__']
+        finally:
             sys.argv = save_argv
 
     def _run_startup_files(self):