From c7b1c99b06a453af879f4768e347ac89000cce42 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Sat, 19 Oct 2013 21:35:33 -0400
Subject: Get rid of our backward implementation of set, sorted, reversed, and
 rpartition.

--HG--
branch : 4.0
---
 coverage/cmdline.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'coverage/cmdline.py')

diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index 0881313e..f2f0c152 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -2,7 +2,6 @@
 
 import optparse, os, sys, traceback
 
-from coverage.backward import sorted                # pylint: disable=W0622
 from coverage.execfile import run_python_file, run_python_module
 from coverage.misc import CoverageException, ExceptionDuringRun, NoSource
 from coverage.debug import info_formatter
-- 
cgit v1.2.1


From 8c3cddefe07e25d96d9e9c4d7ea24b345d88eeec Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Sun, 20 Oct 2013 08:05:24 -0400
Subject: try/except/finally is ok now.

--HG--
branch : 4.0
---
 coverage/cmdline.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'coverage/cmdline.py')

diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index f2f0c152..9ff29f3a 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -564,17 +564,16 @@ class CoverageScript(object):
         self.coverage.start()
         code_ran = True
         try:
-            try:
-                if options.module:
-                    sys.path[0] = ''
-                    self.run_python_module(args[0], args)
-                else:
-                    filename = args[0]
-                    sys.path[0] = os.path.abspath(os.path.dirname(filename))
-                    self.run_python_file(filename, args)
-            except NoSource:
-                code_ran = False
-                raise
+            if options.module:
+                sys.path[0] = ''
+                self.run_python_module(args[0], args)
+            else:
+                filename = args[0]
+                sys.path[0] = os.path.abspath(os.path.dirname(filename))
+                self.run_python_file(filename, args)
+        except NoSource:
+            code_ran = False
+            raise
         finally:
             self.coverage.stop()
             if code_ran:
-- 
cgit v1.2.1


From 6dfbb755d1f6994ccec9ae56ad7f2eedad2ed0d6 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Sun, 20 Oct 2013 08:23:52 -0400
Subject: Except clause can now use 'as', no need for lots of sys.exc_info

--HG--
branch : 4.0
---
 coverage/cmdline.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'coverage/cmdline.py')

diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index 9ff29f3a..93732839 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -716,21 +716,18 @@ def main(argv=None):
         argv = sys.argv[1:]
     try:
         status = CoverageScript().command_line(argv)
-    except ExceptionDuringRun:
+    except ExceptionDuringRun as err:
         # An exception was caught while running the product code.  The
         # sys.exc_info() return tuple is packed into an ExceptionDuringRun
         # exception.
-        _, err, _ = sys.exc_info()
         traceback.print_exception(*err.args)
         status = ERR
-    except CoverageException:
+    except CoverageException as err:
         # A controlled error inside coverage.py: print the message to the user.
-        _, err, _ = sys.exc_info()
         print(err)
         status = ERR
-    except SystemExit:
+    except SystemExit as err:
         # The user called `sys.exit()`.  Exit with their argument, if any.
-        _, err, _ = sys.exc_info()
         if err.args:
             status = err.args[0]
         else:
-- 
cgit v1.2.1