diff options
author | Ned Batchelder <ned@nedbatchelder.com> | 2012-11-11 20:24:18 -0500 |
---|---|---|
committer | Ned Batchelder <ned@nedbatchelder.com> | 2012-11-11 20:24:18 -0500 |
commit | 7fda5e935bb78af2fbc2ff01731d2adb8f6af848 (patch) | |
tree | 5e2b8f9ff19e042f3ec0929fcf6a09ddebc4c38b /coverage/data.py | |
parent | 199b060ac815c5125e8c8955d4d1fe5d273b641b (diff) | |
download | python-coveragepy-git-7fda5e935bb78af2fbc2ff01731d2adb8f6af848.tar.gz |
Remove odd module holding, since I think this is now fixed by always stopping the tracers.
Diffstat (limited to 'coverage/data.py')
-rw-r--r-- | coverage/data.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/coverage/data.py b/coverage/data.py index 7a8d656f..4a79807d 100644 --- a/coverage/data.py +++ b/coverage/data.py @@ -60,10 +60,6 @@ class CoverageData(object): # self.arcs = {} - self.os = os - self.sorted = sorted - self.pickle = pickle - def usefile(self, use_file=True): """Set whether or not to use a disk file for data.""" self.use_file = use_file @@ -101,13 +97,13 @@ class CoverageData(object): def line_data(self): """Return the map from filenames to lists of line numbers executed.""" return dict( - [(f, self.sorted(lmap.keys())) for f, lmap in self.lines.items()] + [(f, sorted(lmap.keys())) for f, lmap in self.lines.items()] ) def arc_data(self): """Return the map from filenames to lists of line number pairs.""" return dict( - [(f, self.sorted(amap.keys())) for f, amap in self.arcs.items()] + [(f, sorted(amap.keys())) for f, amap in self.arcs.items()] ) def write_file(self, filename): @@ -127,7 +123,7 @@ class CoverageData(object): # Write the pickle to the file. fdata = open(filename, 'wb') try: - self.pickle.dump(data, fdata, 2) + pickle.dump(data, fdata, 2) finally: fdata.close() @@ -252,7 +248,7 @@ class CoverageData(object): if fullpath: filename_fn = lambda f: f else: - filename_fn = self.os.path.basename + filename_fn = os.path.basename for filename, lines in self.lines.items(): summ[filename_fn(filename)] = len(lines) return summ |