Merged 4.0 to default

1 files changed, 6 insertions, 9 deletions

diff --git a/lab/parser.py b/lab/parser.py
index ce6902a6..a8e03eec 100644
--- a/lab/parser.py
+++ b/lab/parser.py
@@ -54,13 +54,11 @@ class ParserMain(object):
     def one_file(self, options, filename):
         """Process just one file."""
 
-        if options.dis or options.chunks:
-            try:
-                bp = ByteParser(filename=filename)
-            except CoverageException:
-                _, err, _ = sys.exc_info()
-                print("%s" % (err,))
-                return
+        try:
+            bp = ByteParser(filename=filename)
+        except CoverageException as err:
+            print("%s" % (err,))
+            return
 
         if options.dis:
             print("Main code:")
@@ -88,8 +86,7 @@ class ParserMain(object):
 
                 exit_counts = cp.exit_counts()
 
-                for i, ltext in enumerate(cp.lines):
-                    lineno = i+1
+                for lineno, ltext in enumerate(cp.lines, start=1):
                     m0 = m1 = m2 = m3 = a = ' '
                     if lineno in cp.statement_starts:
                         m0 = '-'