summaryrefslogtreecommitdiff
path: root/hwdb
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2016-11-25 07:59:37 +0100
committerMartin Pitt <martin.pitt@ubuntu.com>2016-11-25 07:59:37 +0100
commit2f08ccc32e5543fc73ac6c9d301d6e5a427dddf7 (patch)
tree2dec3578f74b7ac8daf87693f87dafde26083ba0 /hwdb
parent28d329571aaeebda140122167cd48755637400b2 (diff)
Revert "hwdb/parse_hwdb.py: open files with UTF-8 mode"
"encoding" is not a valid Python 2 keyword, and despite the hashbang this script can be called with Python 2. This reverts commit 115a10c58d343d00b73bd9442f7ce6c294debad8.
Diffstat (limited to 'hwdb')
-rwxr-xr-xhwdb/parse_hwdb.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/hwdb/parse_hwdb.py b/hwdb/parse_hwdb.py
index 556b859191..5d4c5ea64d 100755
--- a/hwdb/parse_hwdb.py
+++ b/hwdb/parse_hwdb.py
@@ -133,8 +133,7 @@ def convert_properties(group):
def parse(fname):
grammar = hwdb_grammar()
try:
- with open(fname, 'r', encoding='UTF-8') as f:
- parsed = grammar.parseFile(f)
+ parsed = grammar.parseFile(fname)
except ParseBaseException as e:
error('Cannot parse {}: {}', fname, e)
return []