From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Fri, 25 Nov 2016 06:59:37 +0000 (+0100)
Subject: Revert "hwdb/parse_hwdb.py: open files with UTF-8 mode"
X-Git-Tag: v233~388
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f08ccc32e5543fc73ac6c9d301d6e5a427dddf7;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/hwdb/parse_hwdb.py b/hwdb/parse_hwdb.py
index 556b8591916..5d4c5ea64df 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 []