admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Python 3 compatibility - wrap map objects in lists

Browse Source
This commit is contained in:
mliszcz
2017-08-16 03:48:41 +02:00
parent 4ed531f679
commit cad5c8313e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
emsdk
View File

@@ -1681,7 +1681,7 @@ def load_sdk_manifest():
t2.__dict__[p] = v.replace(param, ver) t2.__dict__[p] = v.replace(param, ver)
t2.is_old = i < len(category_list) - 2 t2.is_old = i < len(category_list) - 2
if hasattr(t2, 'uses'): if hasattr(t2, 'uses'):
t2.uses = map((lambda x: x.replace(param, ver)), t2.uses) t2.uses = list(map((lambda x: x.replace(param, ver)), t2.uses))
if is_sdk: if is_sdk:
if dependencies_exist(t2): if dependencies_exist(t2):
sdks.append(t2) sdks.append(t2)
@@ -1863,8 +1863,8 @@ def adjusted_path(tools_to_activate, log_additions=False, system_path_only=False
if MSYS: if MSYS:
# XXX Hack: If running native Windows Python in MSYS prompt where PATH entries look like "/c/Windows/System32", os.environ['PATH'] # XXX Hack: If running native Windows Python in MSYS prompt where PATH entries look like "/c/Windows/System32", os.environ['PATH']
# in Python will transform to show them as "C:\\Windows\\System32", so need to reconvert path delimiter back to forward slashes. # in Python will transform to show them as "C:\\Windows\\System32", so need to reconvert path delimiter back to forward slashes.
whole_path = map(to_msys_path, whole_path) whole_path = list(map(to_msys_path, whole_path))
new_emsdk_tools = map(to_msys_path, new_emsdk_tools) new_emsdk_tools = list(map(to_msys_path, new_emsdk_tools))
return ((':' if MSYS else ENVPATH_SEPARATOR).join(whole_path), new_emsdk_tools) return ((':' if MSYS else ENVPATH_SEPARATOR).join(whole_path), new_emsdk_tools)