Skip to content

Commit

Permalink
build: python3 support for configure
Browse files Browse the repository at this point in the history
PR-URL: nodejs#30047
Reviewed-By: Christian Clauss <[email protected]>
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: David Carlier <[email protected]>
  • Loading branch information
rvagg committed Oct 23, 2019
1 parent 7a82e5e commit 779d7ef
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import subprocess
import shutil
import bz2
import io

from distutils.spawn import find_executable as which
from distutils.version import StrictVersion
Expand Down Expand Up @@ -1497,10 +1498,11 @@ def write_config(data, name):
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']:
Expand Down

0 comments on commit 779d7ef

Please sign in to comment.