From 115a10c58d343d00b73bd9442f7ce6c294debad8 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 24 Nov 2016 10:38:01 +0100 Subject: hwdb/parse_hwdb.py: open files with UTF-8 mode pyparsing uses the system locale by default, which in the case of 'C' (in lots of build environment) will fail with a UnicodeDecodeError. Explicitly open it with UTF-8 encoding to guard against this. --- hwdb/parse_hwdb.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hwdb') diff --git a/hwdb/parse_hwdb.py b/hwdb/parse_hwdb.py index 5d4c5ea64d..556b859191 100755 --- a/hwdb/parse_hwdb.py +++ b/hwdb/parse_hwdb.py @@ -133,7 +133,8 @@ def convert_properties(group): def parse(fname): grammar = hwdb_grammar() try: - parsed = grammar.parseFile(fname) + with open(fname, 'r', encoding='UTF-8') as f: + parsed = grammar.parseFile(f) except ParseBaseException as e: error('Cannot parse {}: {}', fname, e) return [] -- cgit v1.2.3-54-g00ecf