1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: make configure.py compatible with python 3

Browse Source 
This patch replaces the following

1. Usage of `filter` with `None` to remove falsy items.
2. Usage of `map` to create lists. (Replaced with List comprehensions).
3. Dictionary's `iteritems` which is removed in Python 3.

PR-URL: https://github.com/nodejs/node/pull/25580
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
This commit is contained in:
Sakthipriyan Vairamani (thefourtheye) 2019-01-19 15:14:47 +05:30 committed by Daniel Bevenius
parent 1d60794321
commit 26f80dcddd
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.py
View File

@ -1139,8 +1139,8 @@ def configure_library(lib, output):
if options.__dict__[shared_lib + '_includes']: if options.__dict__[shared_lib + '_includes']:
output['include_dirs'] += [options.__dict__[shared_lib + '_includes']] output['include_dirs'] += [options.__dict__[shared_lib + '_includes']]
elif pkg_cflags: elif pkg_cflags:
output['include_dirs'] += ( stripped_flags = [flag.strip() for flag in pkg_cflags.split('-I')]
filter(None, map(str.strip, pkg_cflags.split('-I')))) output['include_dirs'] += [flag for flag in stripped_flags if flag]
# libpath needs to be provided ahead libraries # libpath needs to be provided ahead libraries
if options.__dict__[shared_lib + '_libpath']: if options.__dict__[shared_lib + '_libpath']:
@ -1156,7 +1156,7 @@ def configure_library(lib, output):
output['libraries'] += [pkg_libpath] output['libraries'] += [pkg_libpath]
default_libs = getattr(options, shared_lib + '_libname') default_libs = getattr(options, shared_lib + '_libname')
default_libs = map('-l{0}'.format, default_libs.split(',')) default_libs = ['-l{0}'.format(lib) for lib in default_libs.split(',')]
if default_libs: if default_libs:
output['libraries'] += default_libs output['libraries'] += default_libs
@ -1382,7 +1382,8 @@ def configure_intl(o):
# safe to split, cannot contain spaces # safe to split, cannot contain spaces
o['libraries'] += libs.split() o['libraries'] += libs.split()
if cflags: if cflags:
o['include_dirs'] += filter(None, map(str.strip, cflags.split('-I'))) stripped_flags = [flag.strip() for flag in cflags.split('-I')]
o['include_dirs'] += [flag for flag in stripped_flags if flag]
# use the "system" .gyp # use the "system" .gyp
o['variables']['icu_gyp_path'] = 'tools/icu/icu-system.gyp' o['variables']['icu_gyp_path'] = 'tools/icu/icu-system.gyp'
return return
@ -1663,7 +1664,7 @@ config = {
if options.prefix: if options.prefix:
config['PREFIX'] = options.prefix config['PREFIX'] = options.prefix
config = '\n'.join(map('='.join, config.iteritems())) + '\n' config = '\n'.join(['='.join(item) for item in config.items()]) + '\n'
# On Windows there's no reason to search for a different python binary. # On Windows there's no reason to search for a different python binary.
bin_override = None if sys.platform == 'win32' else make_bin_override() bin_override = None if sys.platform == 'win32' else make_bin_override()