Skip to content

Commit e361047

Browse files
committed
scons: use python3-compatible lists
These changes were generated using python's `2to3` tool. Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Jose Fonseca <[email protected]>
1 parent 29c8d75 commit e361047

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

SConstruct

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@ try:
152152
except ImportError:
153153
pass
154154
else:
155-
aliases = default_ans.keys()
156-
aliases.sort()
155+
aliases = sorted(default_ans.keys())
157156
env.Help('\n')
158157
env.Help('Recognized targets:\n')
159158
for alias in aliases:

scons/custom.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def python_scan(node, env, path):
113113
finder = modulefinder.ModuleFinder(path=path)
114114
finder.run_script(node.abspath)
115115
results = []
116-
for name, mod in finder.modules.iteritems():
116+
for name, mod in finder.modules.items():
117117
if mod.__file__ is None:
118118
continue
119119
assert os.path.exists(mod.__file__)
@@ -189,7 +189,7 @@ def _pkg_check_modules(env, name, modules):
189189
except OSError:
190190
return
191191
prefix = name + '_'
192-
for flag_name, flag_value in flags.iteritems():
192+
for flag_name, flag_value in flags.items():
193193
assert '_' not in flag_name
194194
env[prefix + flag_name] = flag_value
195195

@@ -222,7 +222,7 @@ def pkg_use_modules(env, names):
222222
raise Exception('Attempt to use unavailable module %s' % name)
223223

224224
flags = {}
225-
for flag_name, flag_value in env.Dictionary().iteritems():
225+
for flag_name, flag_value in env.Dictionary().items():
226226
if flag_name.startswith(prefix):
227227
flag_name = flag_name[len(prefix):]
228228
if '_' not in flag_name:
@@ -262,7 +262,7 @@ def parse_source_list(env, filename, names=None):
262262

263263
symbols = names
264264
else:
265-
symbols = sym_table.keys()
265+
symbols = list(sym_table.keys())
266266

267267
# convert the symbol table to source lists
268268
src_lists = {}

0 commit comments

Comments
 (0)