From b8a794d72bad66f25ce645d08defb41bd57c3371 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Wed, 18 Mar 2020 10:42:06 -0700 Subject: [PATCH] deps: minor ICU fixes: maint docs/tool, downloader - Docs used the word "copy" when it really meant a tool is needed. - README-FULL-ICU.txt was generated in binary mode, but it's a text file. This breaks on Python3 for maintaining ICU - The ICU downloader was broken (also probably python3). It's basically dead code since 1a25e901b7c380929f0d08599f49dd77897a627f landed (full icu in repo), unless someone deleted the deps/icu-small directory from their repo. Co-Authored-By: Christian Clauss PR-URL: https://github.com/nodejs/node/pull/32347 Reviewed-By: Ujjwal Sharma Reviewed-By: James M Snell Reviewed-By: Richard Lau Reviewed-By: Christian Clauss Reviewed-By: Michael Dawson --- doc/guides/maintaining-icu.md | 2 +- tools/configure.d/nodedownload.py | 2 +- tools/icu/shrink-icu-src.py | 20 +++++++++----------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/doc/guides/maintaining-icu.md b/doc/guides/maintaining-icu.md index 85f13c91298..593b7944f07 100644 --- a/doc/guides/maintaining-icu.md +++ b/doc/guides/maintaining-icu.md @@ -97,7 +97,7 @@ new Intl.DateTimeFormat('es', { month: 'long' }).format(new Date(9E8)); …Should return `enero` not `January`. -* Now, copy `deps/icu` over to `deps/icu-small` +* Now, run the shrink tool to update `deps/icu-small` from `deps/icu` > :warning: Do not modify any source code in `deps/icu-small` ! > See section below about floating patches to ICU. diff --git a/tools/configure.d/nodedownload.py b/tools/configure.d/nodedownload.py index 515704e3de4..4f144e0e4b4 100644 --- a/tools/configure.d/nodedownload.py +++ b/tools/configure.d/nodedownload.py @@ -63,7 +63,7 @@ def checkHash(targetfile, hashAlgo): digest = hashlib.new(hashAlgo) with open(targetfile, 'rb') as f: chunk = f.read(1024) - while chunk != "": + while len(chunk) > 0: digest.update(chunk) chunk = f.read(1024) return digest.hexdigest() diff --git a/tools/icu/shrink-icu-src.py b/tools/icu/shrink-icu-src.py index c91472ed308..3a9ba2fbfbf 100644 --- a/tools/icu/shrink-icu-src.py +++ b/tools/icu/shrink-icu-src.py @@ -128,14 +128,12 @@ print_size(dst_cmp_datafile) readme_name = os.path.join(options.icudst, "README-FULL-ICU.txt" ) # Now, print a short notice -fi = open(readme_name, 'wb') -print("ICU sources - auto generated by shrink-icu-src.py", file=fi) -print("", file=fi) -print("This directory contains the ICU subset used by --with-intl=full-icu", file=fi) -print("It is a strict subset of ICU %s source files with the following exception(s):" % (icu_ver_major), file=fi) -print("* %s : compressed data file" % (dst_cmp_datafile), file=fi) -print("", file=fi) -print("", file=fi) -print("To rebuild this directory, see ../../tools/icu/README.md", file=fi) -print("", file=fi) -fi.close() +msg_fmt = """\ +ICU sources - auto generated by shrink-icu-src.py\n +This directory contains the ICU subset used by --with-intl=full-icu +It is a strict subset of ICU {} source files with the following exception(s): +* {} : compressed data file\n\n +To rebuild this directory, see ../../tools/icu/README.md\n""" + +with open(readme_name, 'w') as out_file: + print(msg_fmt.format(icu_ver_major, dst_cmp_datafile), file=out_file)