Python source files that don't end with a newline can now be executed, fixing #47.

2 files changed, 17 insertions, 10 deletions

diff --git a/coverage/backward.py b/coverage/backward.py
index af46e0dd..425bcc6e 100644
--- a/coverage/backward.py
+++ b/coverage/backward.py
@@ -51,19 +51,20 @@ except NameError:
 
 # Exec is a statement in Py2, a function in Py3
 if sys.version_info >= (3, 0):
-    def exec_function(source, filename, global_map):
+    def exec_code_object(code, global_map):
         """A wrapper around exec()."""
-        exec(compile(source, filename, "exec"), global_map)
+        exec(code, global_map)
 else:
     # OK, this is pretty gross.  In Py2, exec was a statement, but that will
     # be a syntax error if we try to put it in a Py3 file, even if it is never
     # executed.  So hide it inside an evaluated string literal instead.
-    eval(compile("""\
-def exec_function(source, filename, global_map):
-    exec compile(source, filename, "exec") in global_map
-""",
-    "<exec_function>", "exec"
-    ))
+    eval(
+        compile(
+            "def exec_code_object(code, global_map):\n"
+            "    exec code in global_map\n",
+            "<exec_function>", "exec"
+            )
+        )
 
 # ConfigParser was renamed to the more-standard configparser
 try:
diff --git a/coverage/execfile.py b/coverage/execfile.py
index f04840b5..1a2ffadd 100644
--- a/coverage/execfile.py
+++ b/coverage/execfile.py
@@ -2,7 +2,7 @@
 
 import imp, os, sys
 
-from coverage.backward import exec_function
+from coverage.backward import exec_code_object
 from coverage.misc import NoSource, ExceptionDuringRun
 
 
@@ -42,9 +42,15 @@ def run_python_file(filename, args):
         except IOError:
             raise NoSource("No file to run: %r" % filename)
 
+        # 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_function(source, filename, main_mod.__dict__)
+            exec_code_object(code, main_mod.__dict__)
         except:
             # Something went wrong while executing the user code.
             # Get the exc_info, and pack them into an exception that we can