From a91293d4d9ab403046ab5eb022332e4e3d249bd3 Mon Sep 17 00:00:00 2001 From: cclauss Date: Fri, 7 Dec 2018 09:55:32 +0100 Subject: tools: prepare tools/icu/icutrim.py for Python 3 PR-URL: https://github.com/nodejs/node/pull/24888 Reviewed-By: Rich Trott Reviewed-By: Sakthipriyan Vairamani --- tools/icu/icutrim.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'tools/icu') diff --git a/tools/icu/icutrim.py b/tools/icu/icutrim.py index 2b771cb641..116af32e02 100755 --- a/tools/icu/icutrim.py +++ b/tools/icu/icutrim.py @@ -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 @@ -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)) -- cgit v1.2.3