Merge Brett's __main__.py file for the tree.

1 files changed, 3 insertions, 2 deletions

diff --git a/coverage/parser.py b/coverage/parser.py
index 8ad4e05..d033f6d 100644
--- a/coverage/parser.py
+++ b/coverage/parser.py
@@ -5,7 +5,8 @@ import glob, opcode, os, re, sys, token, tokenize
 from coverage.backward import set, sorted, StringIO # pylint: disable=W0622
 from coverage.backward import open_source
 from coverage.bytecode import ByteCodes, CodeObjects
-from coverage.misc import nice_pair, CoverageException, NoSource, expensive
+from coverage.misc import nice_pair, expensive
+from coverage.misc import CoverageException, NoSource, NotPython
 
 
 class CodeParser(object):
@@ -316,7 +317,7 @@ class ByteParser(object):
                 self.code = compile(text + '\n', filename, "exec")
             except SyntaxError:
                 _, synerr, _ = sys.exc_info()
-                raise CoverageException(
+                raise NotPython(
                     "Couldn't parse '%s' as Python source: '%s' at line %d" %
                         (filename, synerr.msg, synerr.lineno)
                     )