Skip to content

Commit

Permalink
build: python3 support for configure
Browse files Browse the repository at this point in the history
PR-URL: #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 authored and targos committed Nov 11, 2019
1 parent 4277066 commit 0415dd7
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import shlex
import subprocess
import shutil
import io

from distutils.spawn import find_executable as which
from distutils.version import StrictVersion

Expand Down Expand Up @@ -1499,10 +1501,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 0415dd7

Please sign in to comment.