Commit 1c7f6a5
build: make configure.py compatible with python 3
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: #25580
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>1 parent b31035d commit 1c7f6a5
1 file changed
Lines changed: 6 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1135,8 +1135,8 @@ def configure_library(lib, output): | |||
| 1135 | 1135 | if options.__dict__[shared_lib + '_includes']: | |
| 1136 | 1136 | output['include_dirs'] += [options.__dict__[shared_lib + '_includes']] | |
| 1137 | 1137 | elif pkg_cflags: | |
| 1138 | - output['include_dirs'] += ( | ||
| 1139 | - filter(None, map(str.strip, pkg_cflags.split('-I')))) | ||
| 1138 | + stripped_flags = [flag.strip() for flag in pkg_cflags.split('-I')] | ||
| 1139 | + output['include_dirs'] += [flag for flag in stripped_flags if flag] | ||
| 1140 | 1140 | ||
| 1141 | 1141 | # libpath needs to be provided ahead libraries | |
| 1142 | 1142 | if options.__dict__[shared_lib + '_libpath']: | |
@@ -1152,7 +1152,7 @@ def configure_library(lib, output): | |||
| 1152 | 1152 | output['libraries'] += [pkg_libpath] | |
| 1153 | 1153 | ||
| 1154 | 1154 | default_libs = getattr(options, shared_lib + '_libname') | |
| 1155 | - default_libs = map('-l{0}'.format, default_libs.split(',')) | ||
| 1155 | + default_libs = ['-l{0}'.format(lib) for lib in default_libs.split(',')] | ||
| 1156 | 1156 | ||
| 1157 | 1157 | if default_libs: | |
| 1158 | 1158 | output['libraries'] += default_libs | |
@@ -1375,7 +1375,8 @@ def write_config(data, name): | |||
| 1375 | 1375 | # safe to split, cannot contain spaces | |
| 1376 | 1376 | o['libraries'] += libs.split() | |
| 1377 | 1377 | if cflags: | |
| 1378 | - o['include_dirs'] += filter(None, map(str.strip, cflags.split('-I'))) | ||
| 1378 | + stripped_flags = [flag.strip() for flag in cflags.split('-I')] | ||
| 1379 | + o['include_dirs'] += [flag for flag in stripped_flags if flag] | ||
| 1379 | 1380 | # use the "system" .gyp | |
| 1380 | 1381 | o['variables']['icu_gyp_path'] = 'tools/icu/icu-system.gyp' | |
| 1381 | 1382 | return | |
@@ -1656,7 +1657,7 @@ def make_bin_override(): | |||
| 1656 | 1657 | if options.prefix: | |
| 1657 | 1658 | config['PREFIX'] = options.prefix | |
| 1658 | 1659 | ||
| 1659 | - config = '\n'.join(map('='.join, config.iteritems())) + '\n' | ||
| 1660 | + config = '\n'.join(['='.join(item) for item in config.items()]) + '\n' | ||
| 1660 | 1661 | ||
| 1661 | 1662 | # On Windows there's no reason to search for a different python binary. | |
| 1662 | 1663 | bin_override = None if sys.platform == 'win32' else make_bin_override() | |
0 commit comments