diff options
| author | Rod Vagg <rod@vagg.org> | 2019-10-21 22:26:02 +1100 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2019-10-24 10:28:44 +1100 |
| commit | 779d7efa72ed514ab81c800c74052c96ad102c08 (patch) | |
| tree | fc39a1a7661cd3123659d713dfe09dabc341afcc /configure.py | |
| parent | 7a82e5ee62e5a3a29059581f208d960ff3ec8696 (diff) | |
| download | android-node-v8-779d7efa72ed514ab81c800c74052c96ad102c08.tar.gz android-node-v8-779d7efa72ed514ab81c800c74052c96ad102c08.tar.bz2 android-node-v8-779d7efa72ed514ab81c800c74052c96ad102c08.zip | |
build: python3 support for configure
PR-URL: https://github.com/nodejs/node/pull/30047
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/configure.py b/configure.py index bfc50d7fbd..8790b3c13f 100755 --- a/configure.py +++ b/configure.py @@ -12,6 +12,7 @@ import shlex import subprocess import shutil import bz2 +import io from distutils.spawn import find_executable as which from distutils.version import StrictVersion @@ -1497,10 +1498,11 @@ def configure_intl(o): icu_ver_major = None matchVerExp = r'^\s*#define\s+U_ICU_VERSION_SHORT\s+"([^"]*)".*' match_version = re.compile(matchVerExp) - for line in open(uvernum_h).readlines(): - m = match_version.match(line) - if m: - icu_ver_major = m.group(1) + with io.open(uvernum_h, encoding='utf8') as in_file: + for line in in_file: + m = match_version.match(line) + if m: + icu_ver_major = str(m.group(1)) if not icu_ver_major: error('Could not read U_ICU_VERSION_SHORT version from %s' % uvernum_h) elif int(icu_ver_major) < icu_versions['minimum_icu']: |