fix #1814 set __file__ when running .ipy files

IPython/core/shellapp.py

@@ -277,20 +277,17 b' class InteractiveShellApp(Configurable):'
             sys.argv = [ py3compat.cast_bytes(a) for a in sys.argv ]
         try:
             if os.path.isfile(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.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:
+                    if full_filename.endswith('.ipy'):
+                        self.shell.safe_execfile_ipy(full_filename)
+                    else:
+                        # default to python, even without extension
                         self.shell.safe_execfile(full_filename, self.shell.user_ns)
-                    finally:
-                        del self.shell.user_ns['__file__']
+                finally:
+                    del self.shell.user_ns['__file__']
         finally:
             sys.argv = save_argv