Skip to content

tools: allow icutrim.py to run on python2 #46263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 2 commits into from
Jan 21, 2023
Merged

tools: allow icutrim.py to run on python2 #46263

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1714f3d
tools: allow icutrim.py to run on python2
mhdawson Jan 18, 2023
b7e4e19
Update tools/icu/icutrim.py
mhdawson Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion tools/icu/icutrim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,10 @@ 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(bytes(r"^Item ([^ ]+) depends on missing item ([^ ]+).*", 'utf-8'))
if (sys.version_info.major < 3):
pat = re.compile(bytes(r"^Item ([^ ]+) depends on missing item ([^ ]+).*").encode('utf-8'))
else:
pat = re.compile(bytes(r"^Item ([^ ]+) depends on missing item ([^ ]+).*", 'utf-8'))
Copy link
Member

@bnoordhuis bnoordhuis Jan 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

python[23]-agnostic, which probably also addresses @targos's objection:

pat = re.compile(br"^Item ([^ ]+) depends on missing item ([^ ]+).*")

for i in range(len(erritems)):
line = erritems[i].strip()
m = pat.match(line)
Expand Down