Convert utils/merge-rulesets.py to py3.6

Hainish · Hainish · commit 5551a342423a · 2018-02-23T09:44:24.000-08:00
diff --git a/make.sh b/make.sh
@@ -57,7 +57,7 @@ do_not_ship="*.py *.xml"
 rm -f $do_not_ship
 cd ../..
 
-python2.7 ./utils/merge-rulesets.py || exit 1
+python3.6 ./utils/merge-rulesets.py || exit 1
 
 cp src/chrome/content/rules/default.rulesets pkg/crx/rules/default.rulesets
 
diff --git a/utils/merge-rulesets.py b/utils/merge-rulesets.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3.6
 
 # Merge all the .xml rulesets into a single "default.rulesets" file -- this
 # prevents inodes from wasting disk space, but more importantly, this works
@@ -19,7 +19,7 @@ def normalize(f):
 	OSX and Linux filesystems encode composite characters differently in
 	filenames. We should normalize to NFC: http://unicode.org/reports/tr15/
 	"""
-	f = unicodedata.normalize("NFC", unicode(f, "utf-8")).encode("utf-8")
+	f = unicodedata.normalize("NFC", f)
 	return f
 
 # commandline arguments parsing (nobody use it, though)
@@ -46,12 +46,12 @@ def normalize(f):
 for filename in sorted(files):
 	tree = xml.etree.ElementTree.parse(filename)
 	root = tree.getroot()
-	
+
 	ruleset = {}
 
 	for attr in root.attrib:
 		ruleset[attr] = root.attrib[attr]
-	
+
 	for child in root:
 		if child.tag in ["target", "rule", "securecookie", "exclusion"]:
 			if child.tag not in ruleset:
