[checkmk-commits] Use a context manager for file I/O in werks handling. Fixed decoding.

Module: check_mk Branch: master Commit: 63a6b955e28d7b19875b43a608ceaab475a6ae55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63a6b955e28d7b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 13 09:50:04 2018 +0100 Use a context manager for file I/O in werks handling. Fixed decoding. Note that first stripping and then decoding is simply wrong, it must be done the other way round. The wrong order just works by accident with UTF-8. Change-Id: Ib95c752e51fb680c7386c87723208e8516bc512f --- cmk/werks.py | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/cmk/werks.py b/cmk/werks.py index 6757763..0be76a0 100644 --- a/cmk/werks.py +++ b/cmk/werks.py @@ -26,6 +26,7 @@ """Code for processing Check_MK werks. This is needed by several components, so it's best place is in the central library.""" +import codecs import os import json @@ -110,12 +111,8 @@ def load(): def load_precompiled_werks_file(path): - werks = {} - - for werk_id, werk in json.load(open(path)).items(): - werks[int(werk_id)] = werk - - return werks + with open(path) as fp: + return {int(werk_id): werk for werk_id, werk in json.load(fp).iteritems()} def load_raw_files(werks_dir): @@ -148,19 +145,20 @@ def _load_werk(path): "body": [], } in_header = True - for line in file(path): - line = line.strip().decode("utf-8") - if in_header and not line: - in_header = False - elif in_header: - key, text = line.split(":", 1) - try: - value = int(text.strip()) - except ValueError: - value = text.strip() - werk[key.lower()] = value - else: - werk["body"].append(line) + with codecs.open(path, encoding="utf-8") as fp: + for line in fp: + line = line.strip() + if in_header and not line: + in_header = False + elif in_header: + key, text = line.split(":", 1) + try: + value = int(text.strip()) + except ValueError: + value = text.strip() + werk[key.lower()] = value + else: + werk["body"].append(line) werk.setdefault("compatible", "compat") werk.setdefault("edition", "cre")