summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorChristian Clauss <cclauss@me.com>2019-08-19 19:24:22 +0200
committerRich Trott <rtrott@gmail.com>2019-08-21 22:16:59 -0700
commit6afd1a3dc183eb0edfde878df7a655cc58caece4 (patch)
tree0eaa11eaae06221c50b91b981901756638acd6c2 /tools
parentf0c8898fb5e8b133001bbea42f1288805d4d4802 (diff)
downloadandroid-node-v8-6afd1a3dc183eb0edfde878df7a655cc58caece4.tar.gz
android-node-v8-6afd1a3dc183eb0edfde878df7a655cc58caece4.tar.bz2
android-node-v8-6afd1a3dc183eb0edfde878df7a655cc58caece4.zip
tools: fix mixup with bytes.decode() and str.encode()
We want to read a bytes file and decode the contents as utf-8 so we can compare against a utf-8 pattern. PR-URL: https://github.com/nodejs/node/pull/29208 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Michaƫl Zasso <targos@protonmail.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/v8_gypfiles/GN-scraper.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/v8_gypfiles/GN-scraper.py b/tools/v8_gypfiles/GN-scraper.py
index 59818ad737..ec72f1d47e 100644
--- a/tools/v8_gypfiles/GN-scraper.py
+++ b/tools/v8_gypfiles/GN-scraper.py
@@ -7,8 +7,8 @@ PLAIN_SOURCE_RE = re.compile('\s*"([^/$].+)"\s*')
def DoMain(args):
gn_filename, pattern = args
src_root = os.path.dirname(gn_filename)
- with open(gn_filename, 'r') as gn_file:
- gn_content = gn_file.read().encode('utf-8')
+ with open(gn_filename, 'rb') as gn_file:
+ gn_content = gn_file.read().decode('utf-8')
scraper_re = re.compile(pattern + r'\[([^\]]+)', re.DOTALL)
matches = scraper_re.search(gn_content)