1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: make install.py python 3 compatiable

Browse Source 
This patch replaces usage of `filter` in such a way that it will be
compatible with Python 3. Also, this patch replaces the usage of `map`
to do a side-effect work with normal `for` loop.

PR-URL: https://github.com/nodejs/node/pull/25583
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Denys Otrishko <shishugi@gmail.com>
This commit is contained in:
Sakthipriyan Vairamani (thefourtheye) 2019-01-19 15:37:54 +05:30 committed by Daniel Bevenius
parent ef1c639db5
commit 907ff0a47d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/install.py
View File

@ -72,8 +72,13 @@ def try_remove(path, dst):
try_unlink(target_path) try_unlink(target_path)
try_rmdir_r(os.path.dirname(target_path)) try_rmdir_r(os.path.dirname(target_path))
def install(paths, dst): map(lambda path: try_copy(path, dst), paths) def install(paths, dst):
def uninstall(paths, dst): map(lambda path: try_remove(path, dst), paths) for path in paths:
try_copy(path, dst)
def uninstall(paths, dst):
for path in paths:
try_remove(path, dst)
def npm_files(action): def npm_files(action):
target_path = 'lib/node_modules/npm/' target_path = 'lib/node_modules/npm/'
@ -85,7 +90,7 @@ def npm_files(action):
# npm has a *lot* of files and it'd be a pain to maintain a fixed list here # npm has a *lot* of files and it'd be a pain to maintain a fixed list here
# so we walk its source directory instead... # so we walk its source directory instead...
for dirname, subdirs, basenames in os.walk('deps/npm', topdown=True): for dirname, subdirs, basenames in os.walk('deps/npm', topdown=True):
subdirs[:] = filter('test'.__ne__, subdirs) # skip test suites subdirs[:] = [subdir for subdir in subdirs if subdir != 'test']
paths = [os.path.join(dirname, basename) for basename in basenames] paths = [os.path.join(dirname, basename) for basename in basenames]
action(paths, target_path + dirname[9:] + '/') action(paths, target_path + dirname[9:] + '/')
@ -162,7 +167,7 @@ def headers(action):
'deps/v8/include/v8-inspector.h', 'deps/v8/include/v8-inspector.h',
'deps/v8/include/v8-inspector-protocol.h' 'deps/v8/include/v8-inspector-protocol.h'
] ]
files = filter(lambda name: name not in inspector_headers, files) files = [name for name in files if name not in inspector_headers]
action(files, dest) action(files, dest)
action([ action([