Skip to content

Commit 2e0139e

Browse files
theotherjimmyCruz Monrreal II
authored andcommitted
Tools: Correct release version "parsing" for py3
1 parent c37190e commit 2e0139e

File tree

1 file changed

+10
-27
lines changed

1 file changed

+10
-27
lines changed

tools/build_api.py

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,19 +1139,18 @@ def get_unique_supported_toolchains(release_targets=None):
11391139

11401140
return unique_supported_toolchains
11411141

1142+
1143+
def _lowercase_release_version(release_version):
1144+
try:
1145+
return release_version.lower()
1146+
except AttributeError:
1147+
return 'all'
1148+
11421149
def mcu_toolchain_list(release_version='5'):
11431150
""" Shows list of toolchains
11441151
11451152
"""
1146-
1147-
if isinstance(release_version, basestring):
1148-
# Force release_version to lowercase if it is a string
1149-
release_version = release_version.lower()
1150-
else:
1151-
# Otherwise default to printing all known targets and toolchains
1152-
release_version = 'all'
1153-
1154-
1153+
release_version = _lowercase_release_version(release_version)
11551154
version_release_targets = {}
11561155
version_release_target_names = {}
11571156

@@ -1176,15 +1175,7 @@ def mcu_target_list(release_version='5'):
11761175
""" Shows target list
11771176
11781177
"""
1179-
1180-
if isinstance(release_version, basestring):
1181-
# Force release_version to lowercase if it is a string
1182-
release_version = release_version.lower()
1183-
else:
1184-
# Otherwise default to printing all known targets and toolchains
1185-
release_version = 'all'
1186-
1187-
1178+
release_version = _lowercase_release_version(release_version)
11881179
version_release_targets = {}
11891180
version_release_target_names = {}
11901181

@@ -1220,15 +1211,7 @@ def mcu_toolchain_matrix(verbose_html=False, platform_filter=None,
12201211
"""
12211212
# Only use it in this function so building works without extra modules
12221213
from prettytable import PrettyTable
1223-
1224-
if isinstance(release_version, basestring):
1225-
# Force release_version to lowercase if it is a string
1226-
release_version = release_version.lower()
1227-
else:
1228-
# Otherwise default to printing all known targets and toolchains
1229-
release_version = 'all'
1230-
1231-
1214+
release_version = _lowercase_release_version(release_version)
12321215
version_release_targets = {}
12331216
version_release_target_names = {}
12341217

0 commit comments

Comments
 (0)