Skip to content

Commit 6d42bd3

Browse files
committed
Tools: Correct release version "parsing" for py3
1 parent 61f3d8b commit 6d42bd3

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
@@ -1122,19 +1122,18 @@ def get_unique_supported_toolchains(release_targets=None):
11221122

11231123
return unique_supported_toolchains
11241124

1125+
1126+
def _lowercase_release_version(release_version):
1127+
try:
1128+
return release_version.lower()
1129+
except AttributeError:
1130+
return 'all'
1131+
11251132
def mcu_toolchain_list(release_version='5'):
11261133
""" Shows list of toolchains
11271134
11281135
"""
1129-
1130-
if isinstance(release_version, basestring):
1131-
# Force release_version to lowercase if it is a string
1132-
release_version = release_version.lower()
1133-
else:
1134-
# Otherwise default to printing all known targets and toolchains
1135-
release_version = 'all'
1136-
1137-
1136+
release_version = _lowercase_release_version(release_version)
11381137
version_release_targets = {}
11391138
version_release_target_names = {}
11401139

@@ -1159,15 +1158,7 @@ def mcu_target_list(release_version='5'):
11591158
""" Shows target list
11601159
11611160
"""
1162-
1163-
if isinstance(release_version, basestring):
1164-
# Force release_version to lowercase if it is a string
1165-
release_version = release_version.lower()
1166-
else:
1167-
# Otherwise default to printing all known targets and toolchains
1168-
release_version = 'all'
1169-
1170-
1161+
release_version = _lowercase_release_version(release_version)
11711162
version_release_targets = {}
11721163
version_release_target_names = {}
11731164

@@ -1203,15 +1194,7 @@ def mcu_toolchain_matrix(verbose_html=False, platform_filter=None,
12031194
"""
12041195
# Only use it in this function so building works without extra modules
12051196
from prettytable import PrettyTable
1206-
1207-
if isinstance(release_version, basestring):
1208-
# Force release_version to lowercase if it is a string
1209-
release_version = release_version.lower()
1210-
else:
1211-
# Otherwise default to printing all known targets and toolchains
1212-
release_version = 'all'
1213-
1214-
1197+
release_version = _lowercase_release_version(release_version)
12151198
version_release_targets = {}
12161199
version_release_target_names = {}
12171200

0 commit comments

Comments
 (0)