1 files changed, 9 insertions, 7 deletions
diff --git a/src/3rdparty/masm/yarr/generateYarrCanonicalizeUnicode b/src/3rdparty/masm/yarr/generateYarrCanonicalizeUnicode
index a103bcdf16..95549c7eb5 100644
--- a/src/3rdparty/masm/yarr/generateYarrCanonicalizeUnicode
+++ b/src/3rdparty/masm/yarr/generateYarrCanonicalizeUnicode
@@ -31,7 +31,6 @@ import optparse
 import os
 import re
 import sys
-from sets import Set
 
 header = """/*
 * Copyright (C) 2016 Apple Inc. All rights reserved.
@@ -78,9 +77,12 @@ def openOrExit(path, mode):
         dirname = os.path.dirname(path)
         if not os.path.isdir(dirname):
             os.makedirs(dirname)
-        return open(path, mode)
+        if sys.version_info.major >= 3:
+            return open(path, mode, encoding="UTF-8")
+        else:
+            return open(path, mode)
     except IOError as e:
-        print "I/O error opening {0}, ({1}): {2}".format(path, e.errno, e.strerror)
+        print("I/O error opening {0}, ({1}): {2}".format(path, e.errno, e.strerror))
         exit(1)
 
 class Canonicalize:
@@ -93,7 +95,7 @@ class Canonicalize:
         self.canonicalGroups[mapping].append(code)
         
     def readCaseFolding(self, file):
-        codesSeen = Set()
+        codesSeen = set()
         for line in file:
             line = line.split('#', 1)[0]
             line = line.rstrip()
@@ -154,8 +156,8 @@ class Canonicalize:
         
         for i in range(len(characterSets)):
             characters = ""
-            set = characterSets[i]
-            for ch in set:
+            cur_set = characterSets[i]
+            for ch in cur_set:
                 characters = characters + "0x{character:04x}, ".format(character=ch)
             file.write("const UChar32 unicodeCharacterSet{index:d}[] = {{ {characters}0 }};\n".format(index=i, characters=characters))
 
@@ -189,7 +191,7 @@ if __name__ == "__main__":
     caseFoldingTxtPath = args[0]
     canonicalizeHPath = args[1]
     caseFoldingTxtFile = openOrExit(caseFoldingTxtPath, "r")
-    canonicalizeHFile = openOrExit(canonicalizeHPath, "wb")
+    canonicalizeHFile = openOrExit(canonicalizeHPath, "w")
 
     canonicalize = Canonicalize()
     canonicalize.readCaseFolding(caseFoldingTxtFile)