ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Python3 fixes

pull/11308/head
Olli-Pekka Puolitaival 2019-08-15 09:26:06 +03:00 committed by adbridge
parent 6b4745209e
commit c68bd37a96
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/export/exporters.py
View File

@ -331,7 +331,7 @@ class Exporter(object):
@classmethod @classmethod
def all_supported_targets(cls): def all_supported_targets(cls):
return [t for t in TARGET_MAP.keys() if cls.is_target_supported(t)] return [t for t in list(TARGET_MAP) if cls.is_target_supported(t)]
@staticmethod @staticmethod
def filter_dot(str): def filter_dot(str):

6
tools/export/gnuarmeclipse/__init__.py
View File

@ -368,15 +368,15 @@ class GNUARMEclipse(Exporter):
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
def dump_tree(self, nodes, depth=0): def dump_tree(self, nodes, depth=0):
for k in nodes.keys(): for k in list(nodes):
node = nodes[k] node = nodes[k]
parent_name = node['parent'][ parent_name = node['parent'][
'name'] if 'parent' in node.keys() else '' 'name'] if 'parent' in list(node) else ''
if len(node['children'].keys()) != 0: if len(node['children'].keys()) != 0:
self.dump_tree(node['children'], depth + 1) self.dump_tree(node['children'], depth + 1)
def dump_paths(self, nodes, depth=0): def dump_paths(self, nodes, depth=0):
for k in nodes.keys(): for k in list(nodes):
node = nodes[k] node = nodes[k]
parts = [] parts = []
while True: while True:

4
tools/export/iar/__init__.py
View File

@ -41,7 +41,7 @@ class IAR(Exporter):
@classmethod @classmethod
def is_target_supported(cls, target_name): def is_target_supported(cls, target_name):
target = TARGET_MAP[target_name] target = TARGET_MAP[target_name]
return _supported(target, _GUI_OPTIONS.keys()) return _supported(target, list(_GUI_OPTIONS))
def iar_groups(self, grouped_src): def iar_groups(self, grouped_src):
@ -92,7 +92,7 @@ class IAR(Exporter):
"IlinkProgramEntryLabel": "__iar_program_start", "IlinkProgramEntryLabel": "__iar_program_start",
} }
iar_defaults.update(device_info) iar_defaults.update(device_info)
IARdevice = namedtuple('IARdevice', iar_defaults.keys()) IARdevice = namedtuple('IARdevice', list(iar_defaults))
return IARdevice(**iar_defaults) return IARdevice(**iar_defaults)
def format_file(self, file): def format_file(self, file):

2
tools/test/examples/examples_lib.py
View File

@ -41,7 +41,7 @@ from tools.toolchains import TOOLCHAINS
from tools.utils import write_json_to_file from tools.utils import write_json_to_file
SUPPORTED_TOOLCHAINS = list(TOOLCHAINS - set(u'uARM')) SUPPORTED_TOOLCHAINS = list(TOOLCHAINS - set(u'uARM'))
SUPPORTED_IDES = [exp for exp in EXPORTERS.keys() + EXPORTER_ALIASES.keys() SUPPORTED_IDES = [exp for exp in list(EXPORTERS) + list(EXPORTER_ALIASES)
if exp != "cmsis" and exp != "zip"] if exp != "cmsis" and exp != "zip"]