tools: fixup icutrim.py use of string and bytes objects

PR-URL: #31659
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

Author: jmercier-lbi

tools/icu/icutrim.py

@@ -13,6 +13,7 @@
 
 from __future__ importprint_function
 
+importio
 importjson
 importoptparse
 importos
@@ -159,9 +160,8 @@ def runcmd(tool, cmd, doContinue=False):
 returnrc
 
 ## STEP 0 - read in json config
-fi=open(options.filterfile, "rb")
-config=json.load(fi)
-fi.close()
+withio.open(options.filterfile, encoding='utf-8') asfi:
+config=json.load(fi)
 
 ifoptions.locales:
 config["variables"] =config.get("variables", {})
@@ -285,10 +285,9 @@ def addTreeByType(tree, mytree):
 # read in the resource list for the tree
 treelistfile=os.path.join(options.tmpdir,"%s.lst"%tree)
 runcmd("iculslocs", "-i %s -N %s -T %s -l > %s"% (outfile, dataname, tree, treelistfile))
-fi=open(treelistfile, 'rb')
-treeitems=fi.readlines()
-trees[tree]["locs"] = [treeitems[i].strip() foriinrange(len(treeitems))]
-fi.close()
+withio.open(treelistfile, 'r', encoding='utf-8') asfi:
+treeitems=fi.readlines()
+trees[tree]["locs"] = [line.strip() forlineintreeitems]
 iftreenotinconfig.get("trees", {}):
 print(" Warning: filter file %s does not mention trees.%s - will be kept as-is"% (options.filterfile, tree))
 else:
@@ -317,12 +316,12 @@ def removeList(count=0):
 erritems=fi.readlines()
 fi.close()
 #Item zone/zh_Hant_TW.res depends on missing item zone/zh_Hant.res
-pat=re.compile("""^Item ([^ ]+) depends on missing item ([^ ]+).*""")
+pat=re.compile(bytes(r"^Item ([^ ]+) depends on missing item ([^ ]+).*", 'utf-8'))
 foriinrange(len(erritems)):
 line=erritems[i].strip()
 m=pat.match(line)
 ifm:
-toDelete=m.group(1)
+toDelete=m.group(1).decode("utf-8")
 if(options.verbose>5):
 print("<< %s added to delete"%toDelete)
 remove.add(toDelete)