Skip to content

Commit

Permalink
tools: fix mixup with bytes.decode() and str.encode()
Browse files Browse the repository at this point in the history
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: #29208
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
  • Loading branch information
cclauss authored and Trott committed Aug 22, 2019
1 parent f0c8898 commit 6afd1a3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/v8_gypfiles/GN-scraper.py
Expand Up @@ -7,8 +7,8 @@
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)
Expand Down

0 comments on commit 6afd1a3

Please sign in to comment.