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/control.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'coverage/control.py')

diff --git a/coverage/control.py b/coverage/control.py
index 4b76121c..31fc511e 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -3,7 +3,7 @@
 import atexit, os, random, socket, sys
 
 from coverage.annotate import AnnotateReporter
-from coverage.backward import string_class, iitems, sorted  # pylint: disable=W0622
+from coverage.backward import string_class, iitems
 from coverage.codeunit import code_unit_factory, CodeUnit
 from coverage.collector import Collector
 from coverage.config import CoverageConfig
-- 
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/control.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'coverage/control.py')

diff --git a/coverage/control.py b/coverage/control.py
index 31fc511e..466f76dd 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -686,12 +686,11 @@ class coverage(object):
                 outfile = open(self.config.xml_output, "w")
                 file_to_close = outfile
         try:
-            try:
-                reporter = XmlReporter(self, self.config)
-                return reporter.report(morfs, outfile=outfile)
-            except CoverageException:
-                delete_file = True
-                raise
+            reporter = XmlReporter(self, self.config)
+            return reporter.report(morfs, outfile=outfile)
+        except CoverageException:
+            delete_file = True
+            raise
         finally:
             if file_to_close:
                 file_to_close.close()
-- 
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/control.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'coverage/control.py')

diff --git a/coverage/control.py b/coverage/control.py
index 466f76dd..51ff0439 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -98,8 +98,7 @@ class coverage(object):
                 config_file = ".coveragerc"
             try:
                 self.config.from_file(config_file)
-            except ValueError:
-                _, err, _ = sys.exc_info()
+            except ValueError as err:
                 raise CoverageException(
                     "Couldn't read config file %s: %s" % (config_file, err)
                     )
-- 
cgit v1.2.1