summaryrefslogtreecommitdiff
path: root/coverage/data.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2015-08-20 21:28:37 -0400
committerNed Batchelder <ned@nedbatchelder.com>2015-08-20 21:28:37 -0400
commit3fb754d683d4ba71b04952c27feaafcdae7225e1 (patch)
tree9f3e3e44a868442213a415d2fc1d7647feef18a6 /coverage/data.py
parenteab4dbcf6337ce288467305efae0c86b049bab4b (diff)
downloadpython-coveragepy-git-3fb754d683d4ba71b04952c27feaafcdae7225e1.tar.gz
CoverageData.read and .write are now inverses of each other.
Diffstat (limited to 'coverage/data.py')
-rw-r--r--coverage/data.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/coverage/data.py b/coverage/data.py
index 974764b0..c319e65a 100644
--- a/coverage/data.py
+++ b/coverage/data.py
@@ -297,19 +297,14 @@ class CoverageData(object):
@classmethod
def _open_for_reading(cls, filename):
"""Open a file appropriately for reading data."""
- f = open(filename, "r")
- try:
- go_away = f.read(len(cls._GO_AWAY))
- if go_away != cls._GO_AWAY:
- raise CoverageException("Doesn't seem to be a coverage.py data file")
- except Exception:
- f.close()
- raise
- return f
+ return open(filename, "r")
@classmethod
def _read_raw_data(cls, file_obj):
"""Read the raw data from a file object."""
+ go_away = file_obj.read(len(cls._GO_AWAY))
+ if go_away != cls._GO_AWAY:
+ raise CoverageException("Doesn't seem to be a coverage.py data file")
return json.load(file_obj)
@classmethod