diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-11-30 10:25:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-30 10:25:09 +0100 |
| commit | cd108a83d9b7bbbf77ba2849707678e89aeb89a8 (patch) | |
| tree | bab22fb4bb7851bb77e98ad10310136212fd4ab9 | |
| parent | 2926b130b69651539a90e866db43466b9b0ccfc5 (diff) | |
| parent | aeceb3901a5c36154321be78993ed68d537fc9b4 (diff) | |
Merge pull request #4772 from martinpitt/hwdb
parse_hwdb: fix to work with pyparsing 2.1.10
| -rwxr-xr-x | hwdb/parse_hwdb.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hwdb/parse_hwdb.py b/hwdb/parse_hwdb.py index 5d4c5ea64d..d94d8d13d8 100755 --- a/hwdb/parse_hwdb.py +++ b/hwdb/parse_hwdb.py @@ -56,7 +56,7 @@ except ImportError: lru_cache = lambda: (lambda f: f) EOL = LineEnd().suppress() -EMPTYLINE = LineStart() + LineEnd() +EMPTYLINE = LineEnd() COMMENTLINE = pythonStyleComment + EOL INTEGER = Word(nums) REAL = Combine((INTEGER + Optional('.' + Optional(INTEGER))) ^ ('.' + INTEGER)) @@ -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 [] |