diff options
author | Ned Batchelder <ned@nedbatchelder.com> | 2009-04-16 22:46:30 -0400 |
---|---|---|
committer | Ned Batchelder <ned@nedbatchelder.com> | 2009-04-16 22:46:30 -0400 |
commit | cdb917c8299a1382ecd1b43f8a3298810ccac200 (patch) | |
tree | 89c92c2f18d68e8089d2bd6466ed72291030407d /coverage/data.py | |
parent | 8de394a11922bd1778745e08768ae0db1ada4227 (diff) | |
download | python-coveragepy-cdb917c8299a1382ecd1b43f8a3298810ccac200.tar.gz |
Remove an unused parameter, and other small cleanups to data storage
Diffstat (limited to 'coverage/data.py')
-rw-r--r-- | coverage/data.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/coverage/data.py b/coverage/data.py index 06f4634..deebfbe 100644 --- a/coverage/data.py +++ b/coverage/data.py @@ -26,10 +26,8 @@ class CoverageData: # self.executed = {} - def usefile(self, use_file=True, filename_default=None): + def usefile(self, use_file=True): self.use_file = use_file - if filename_default and not self.filename: - self.filename_default = filename_default def read(self, parallel=False): """Read coverage data from the coverage data file (if it exists).""" @@ -69,8 +67,10 @@ class CoverageData: """ try: fdata = open(filename, 'rb') - executed = pickle.load(fdata) - fdata.close() + try: + executed = pickle.load(fdata) + finally: + fdata.close() if isinstance(executed, types.DictType): return executed else: @@ -94,8 +94,8 @@ class CoverageData: for filename, file_data in new_data.items(): self.executed.setdefault(filename, {}).update(file_data) - def add_raw_data(self, data_points): - """Add raw data. + def add_line_data(self, data_points): + """Add executed line data. `data_points` is (filename, lineno) pairs. |