1 files changed, 28 insertions, 6 deletions
diff --git a/coverage/execfile.py b/coverage/execfile.py
index ddcfa149..333163f8 100644
--- a/coverage/execfile.py
+++ b/coverage/execfile.py
@@ -2,8 +2,8 @@
 
 import imp, os, sys
 
-from coverage.backward import exec_function
-from coverage.misc import NoSource
+from coverage.backward import exec_code_object
+from coverage.misc import NoSource, ExceptionDuringRun
 
 
 try:
@@ -16,11 +16,11 @@ except KeyError:
 
 def run_python_file(filename, args):
     """Run a python file as if it were the main program on the command line.
-    
+
     `filename` is the path to the file to execute, it need not be a .py file.
     `args` is the argument array to present as sys.argv, including the first
     element representing the file being executed.
-    
+
     """
     # Create a module to serve as __main__
     old_main_mod = sys.modules['__main__']
@@ -36,15 +36,37 @@ def run_python_file(filename, args):
     sys.path[0] = os.path.dirname(filename)
 
     try:
+        # Open the source file.
         try:
             source = open(filename, 'rU').read()
         except IOError:
             raise NoSource("No file to run: %r" % filename)
-        exec_function(source, filename, main_mod.__dict__)
+
+        # We have the source.  `compile` still needs the last line to be clean,
+        # so make sure it is, then compile a code object from it.
+        if source[-1] != '\n':
+            source += '\n'
+        code = compile(source, filename, "exec")
+
+        # Execute the source file.
+        try:
+            exec_code_object(code, main_mod.__dict__)
+        except SystemExit:
+            # The user called sys.exit().  Just pass it along to the upper
+            # layers, where it will be handled.
+            raise
+        except:
+            # Something went wrong while executing the user code.
+            # Get the exc_info, and pack them into an exception that we can
+            # throw up to the outer loop.  We peel two layers off the traceback
+            # so that the coverage.py code doesn't appear in the final printed
+            # traceback.
+            typ, err, tb = sys.exc_info()
+            raise ExceptionDuringRun(typ, err, tb.tb_next.tb_next)
     finally:
         # Restore the old __main__
         sys.modules['__main__'] = old_main_mod
-        
+
         # Restore the old argv and path
         sys.argv = old_argv
         sys.path[0] = old_path0