From 483f8d47cd8b18a091364c36b0e9df00c6530b82 Mon Sep 17 00:00:00 2001 From: cclauss Date: Tue, 13 Aug 2019 14:53:52 +0200 Subject: [PATCH] build: support py3 for configure.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/29106 Reviewed-By: Anna Henningsen Reviewed-By: Michaël Zasso Reviewed-By: Richard Lau Reviewed-By: Sam Roberts Reviewed-By: Jiawen Geng Reviewed-By: Rich Trott (cherry picked from commit a582c6b07ccce44973acaba4c60c4549cbaa5c38) --- configure.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/configure.py b/configure.py index 2855138ed44e5b..7f68d8628f9a83 100755 --- a/configure.py +++ b/configure.py @@ -7,7 +7,6 @@ import shlex import subprocess import shutil -import string from distutils.spawn import find_executable as which # If not run from node/, cd to node/. @@ -548,11 +547,14 @@ def warn(msg): def b(value): """Returns the string 'true' if value is truthy, 'false' otherwise.""" - if value: - return 'true' - else: - return 'false' + return 'true' if value else 'false' + +def B(value): + """Returns 1 if value is truthy, 0 otherwise.""" + return 1 if value else 0 +def to_utf8(s): + return s if isinstance(s, str) else s.decode("utf-8") def pkg_config(pkg): pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config') @@ -562,7 +564,7 @@ def pkg_config(pkg): proc = subprocess.Popen( shlex.split(pkg_config) + ['--silence-errors', flag, pkg], stdout=subprocess.PIPE) - val = proc.communicate()[0].strip() + val = to_utf8(proc.communicate()[0]).strip() except OSError as e: if e.errno != errno.ENOENT: raise e # Unexpected error. return (None, None, None) # No pkg-config/pkgconf installed. @@ -577,10 +579,10 @@ def try_check_compiler(cc, lang): except OSError: return (False, False, '', '') - proc.stdin.write('__clang__ __GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__ ' - '__clang_major__ __clang_minor__ __clang_patchlevel__') + proc.stdin.write(b'__clang__ __GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__ ' + b'__clang_major__ __clang_minor__ __clang_patchlevel__') - values = (proc.communicate()[0].split() + ['0'] * 7)[0:7] + values = (to_utf8(proc.communicate()[0]).split() + ['0'] * 7)[0:7] is_clang = values[0] == '1' gcc_version = tuple(values[1:1+3]) clang_version = tuple(values[4:4+3]) @@ -607,7 +609,7 @@ def get_version_helper(cc, regexp): ''') sys.exit() - match = re.search(regexp, proc.communicate()[1]) + match = re.search(regexp, to_utf8(proc.communicate()[1])) if match: return match.group(2) @@ -638,8 +640,8 @@ def get_gas_version(cc): ''') sys.exit() - match = re.match(r"GNU assembler version ([2-9]\.[0-9]+)", - proc.communicate()[1]) + gas_ret = to_utf8(proc.communicate()[1]) + match = re.match(r"GNU assembler version ([2-9]\.[0-9]+)", gas_ret) if match: return match.group(1) @@ -699,10 +701,8 @@ def cc_macros(cc=None): ''') sys.exit() - p.stdin.write('\n') - out = p.communicate()[0] - - out = str(out).split('\n') + p.stdin.write(b'\n') + out = to_utf8(p.communicate()[0]).split('\n') k = {} for line in out: @@ -1176,7 +1176,7 @@ def write_config(data, name): o['variables']['icu_small'] = b(True) locs = set(options.with_icu_locales.split(',')) locs.add('root') # must have root - o['variables']['icu_locales'] = string.join(locs,',') + o['variables']['icu_locales'] = ','.join(str(loc) for loc in locs) # We will check a bit later if we can use the canned deps/icu-small elif with_intl == 'full-icu': # full ICU