From 80a0e8e5743a125720903a87c60c96741b221bd7 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Thu, 20 Aug 2015 21:28:37 -0400 Subject: CoverageData.read and .write are now inverses of each other. --- coverage/data.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'coverage/data.py') diff --git a/coverage/data.py b/coverage/data.py index 974764b..c319e65 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 -- cgit v1.2.1