Skip to content

Commit

Permalink
tools: prepare tools/icu/icutrim.py for Python 3
Browse files Browse the repository at this point in the history
PR-URL: #24888
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
  • Loading branch information
cclauss authored and BethGriggs committed Dec 17, 2018
1 parent e140d41 commit 1f61c89
Showing 1 changed file with 16 additions and 7 deletions.
23 changes: 16 additions & 7 deletions tools/icu/icutrim.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,25 @@
# Use "-h" to get help options.

from __future__ import print_function
import sys
import shutil
# for utf-8
reload(sys)
sys.setdefaultencoding("utf-8")

import json
import optparse
import os
import json
import re
import shutil
import sys

try:
# for utf-8 on Python 2
reload(sys)
sys.setdefaultencoding("utf-8")
except NameError:
pass # Python 3 already defaults to utf-8

try:
basestring # Python 2
except NameError:
basestring = str # Python 3

endian=sys.byteorder

Expand Down Expand Up @@ -214,7 +223,7 @@ def queueForRemoval(tree):
if(options.verbose>0):
print("* %s: %d items" % (tree, len(mytree["locs"])))
# do varible substitution for this tree here
if type(config["trees"][tree]) == str or type(config["trees"][tree]) == unicode:
if isinstance(config["trees"][tree], basestring):
treeStr = config["trees"][tree]
if(options.verbose>5):
print(" Substituting $%s for tree %s" % (treeStr, tree))
Expand Down

0 comments on commit 1f61c89

Please sign in to comment.