From c7b1c99b06a453af879f4768e347ac89000cce42 Mon Sep 17 00:00:00 2001 From: Ned Batchelder 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/data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coverage/data.py') diff --git a/coverage/data.py b/coverage/data.py index fb88c5b1..a32e20a4 100644 --- a/coverage/data.py +++ b/coverage/data.py @@ -2,7 +2,7 @@ import os -from coverage.backward import iitems, pickle, sorted # pylint: disable=W0622 +from coverage.backward import iitems, pickle from coverage.files import PathAliases from coverage.misc import file_be_gone -- cgit v1.2.1 From bad63e02b113626a048ea5eb253293c61902e291 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sat, 19 Oct 2013 22:08:37 -0400 Subject: Generator expressons are ok now. --HG-- branch : 4.0 --- coverage/data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coverage/data.py') diff --git a/coverage/data.py b/coverage/data.py index a32e20a4..61b3554f 100644 --- a/coverage/data.py +++ b/coverage/data.py @@ -101,13 +101,13 @@ class CoverageData(object): def line_data(self): """Return the map from filenames to lists of line numbers executed.""" return dict( - [(f, sorted(lmap.keys())) for f, lmap in iitems(self.lines)] + (f, sorted(lmap.keys())) for f, lmap in iitems(self.lines) ) def arc_data(self): """Return the map from filenames to lists of line number pairs.""" return dict( - [(f, sorted(amap.keys())) for f, amap in iitems(self.arcs)] + (f, sorted(amap.keys())) for f, amap in iitems(self.arcs) ) def write_file(self, filename): -- cgit v1.2.1 From 6b6a4488adc12d390c5e0c8f13829dd9bf125309 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sun, 20 Oct 2013 07:58:57 -0400 Subject: with statements: no more finally close --HG-- branch : 4.0 --- coverage/data.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'coverage/data.py') diff --git a/coverage/data.py b/coverage/data.py index 61b3554f..042b6405 100644 --- a/coverage/data.py +++ b/coverage/data.py @@ -128,11 +128,8 @@ class CoverageData(object): self.debug.write("Writing data to %r" % (filename,)) # Write the pickle to the file. - fdata = open(filename, 'wb') - try: + with open(filename, 'wb') as fdata: pickle.dump(data, fdata, 2) - finally: - fdata.close() def read_file(self, filename): """Read the coverage data from `filename`.""" @@ -142,11 +139,8 @@ class CoverageData(object): """Return the raw pickled data from `filename`.""" if self.debug and self.debug.should('dataio'): self.debug.write("Reading data from %r" % (filename,)) - fdata = open(filename, 'rb') - try: + with open(filename, 'rb') as fdata: data = pickle.load(fdata) - finally: - fdata.close() return data def _read_file(self, filename): -- cgit v1.2.1