[Lldb-commits] [lldb] r356647 - Use list comprehension instead of map/filter to prepare Python2/3 compat
Serge Guelton via lldb-commits
lldb-commits at lists.llvm.org
Thu Mar 21 00:19:10 PDT 2019
Author: serge_sans_paille
Date: Thu Mar 21 00:19:09 2019
New Revision: 356647
URL: http://llvm.org/viewvc/llvm-project?rev=356647&view=rev
Log:
Use list comprehension instead of map/filter to prepare Python2/3 compat
Differential Revision: https://reviews.llvm.org/D59579
Modified:
lldb/trunk/packages/Python/lldbsuite/test/dotest.py
lldb/trunk/scripts/analyze-project-deps.py
lldb/trunk/scripts/swig_bot_lib/local.py
lldb/trunk/utils/lui/lldbutil.py
lldb/trunk/utils/vim-lldb/python-vim-lldb/lldb_controller.py
Modified: lldb/trunk/packages/Python/lldbsuite/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/dotest.py?rev=356647&r1=356646&r2=356647&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py Thu Mar 21 00:19:09 2019
@@ -524,8 +524,7 @@ def parseOptionsAndInitTestdirs():
# Gather all the dirs passed on the command line.
if len(args.args) > 0:
- configuration.testdirs = list(
- map(lambda x: os.path.realpath(os.path.abspath(x)), args.args))
+ configuration.testdirs = [os.path.realpath(os.path.abspath(x)) for x in args.args]
# Shut off multiprocessing mode when test directories are specified.
configuration.no_multiprocess_test_runner = True
Modified: lldb/trunk/scripts/analyze-project-deps.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/analyze-project-deps.py?rev=356647&r1=356646&r2=356647&view=diff
==============================================================================
--- lldb/trunk/scripts/analyze-project-deps.py (original)
+++ lldb/trunk/scripts/analyze-project-deps.py Thu Mar 21 00:19:09 2019
@@ -65,7 +65,7 @@ def scan_deps(this_dir, file):
for (base, dirs, files) in os.walk(inc_dir):
dir = os.path.basename(base)
relative = os.path.relpath(base, inc_dir)
- inc_files = filter(lambda x : os.path.splitext(x)[1] in [".h"], files)
+ inc_files = [x for x in files if os.path.splitext(x)[1] in [".h"]]
relative = relative.replace("\\", "/")
for inc in inc_files:
inc_path = os.path.join(base, inc)
@@ -74,7 +74,7 @@ for (base, dirs, files) in os.walk(inc_d
for (base, dirs, files) in os.walk(src_dir):
dir = os.path.basename(base)
relative = os.path.relpath(base, src_dir)
- src_files = filter(lambda x : os.path.splitext(x)[1] in [".cpp", ".h", ".mm"], files)
+ src_files = [x for x in files if os.path.splitext(x)[1] in [".cpp", ".h", ".mm"]]
norm_base_path = os.path.normpath(os.path.join("lldb", relative))
norm_base_path = norm_base_path.replace("\\", "/")
for src in src_files:
Modified: lldb/trunk/scripts/swig_bot_lib/local.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/swig_bot_lib/local.py?rev=356647&r1=356646&r2=356647&view=diff
==============================================================================
--- lldb/trunk/scripts/swig_bot_lib/local.py (original)
+++ lldb/trunk/scripts/swig_bot_lib/local.py Thu Mar 21 00:19:09 2019
@@ -54,10 +54,8 @@ def pack_archive(bytes_io, src_root, fil
full_path = os.path.normpath(os.path.join(src_root, subfolder))
candidates = [os.path.normpath(os.path.join(full_path, f))
for f in os.listdir(full_path)]
- actual = filter(
- lambda f: os.path.isfile(f) and os.path.splitext(f)[1] == ext,
- candidates)
- return (subfolder, map(lambda f: os.path.basename(f), actual))
+ actual = [f for f in candidates if os.path.isfile(f) and os.path.splitext(f)[1] == ext]
+ return (subfolder, [os.path.basename(f) for f in actual])
archive_entries = map(filter_func, filters)
else:
for (root, dirs, files) in os.walk(src_root):
Modified: lldb/trunk/utils/lui/lldbutil.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/utils/lui/lldbutil.py?rev=356647&r1=356646&r2=356647&view=diff
==============================================================================
--- lldb/trunk/utils/lui/lldbutil.py (original)
+++ lldb/trunk/utils/lui/lldbutil.py Thu Mar 21 00:19:09 2019
@@ -84,7 +84,7 @@ def int_to_bytearray(val, bytesize):
return None
packed = struct.pack(fmt, val)
- return bytearray(map(ord, packed))
+ return bytearray(ord(x) for x in packed)
def bytearray_to_int(bytes, bytesize):
@@ -706,7 +706,7 @@ def get_function_names(thread):
def GetFuncName(i):
return thread.GetFrameAtIndex(i).GetFunctionName()
- return map(GetFuncName, range(thread.GetNumFrames()))
+ return [GetFuncName(i) for i in range(thread.GetNumFrames())]
def get_symbol_names(thread):
@@ -716,7 +716,7 @@ def get_symbol_names(thread):
def GetSymbol(i):
return thread.GetFrameAtIndex(i).GetSymbol().GetName()
- return map(GetSymbol, range(thread.GetNumFrames()))
+ return [GetSymbol(i) for i in range(thread.GetNumFrames())]
def get_pc_addresses(thread):
@@ -726,7 +726,7 @@ def get_pc_addresses(thread):
def GetPCAddress(i):
return thread.GetFrameAtIndex(i).GetPCAddress()
- return map(GetPCAddress, range(thread.GetNumFrames()))
+ return [GetPCAddress(i) for i in range(thread.GetNumFrames())]
def get_filenames(thread):
@@ -737,7 +737,7 @@ def get_filenames(thread):
return thread.GetFrameAtIndex(
i).GetLineEntry().GetFileSpec().GetFilename()
- return map(GetFilename, range(thread.GetNumFrames()))
+ return [GetFilename(i) for i in range(thread.GetNumFrames())]
def get_line_numbers(thread):
@@ -747,7 +747,7 @@ def get_line_numbers(thread):
def GetLineNumber(i):
return thread.GetFrameAtIndex(i).GetLineEntry().GetLine()
- return map(GetLineNumber, range(thread.GetNumFrames()))
+ return [GetLineNumber(i) for i in range(thread.GetNumFrames())]
def get_module_names(thread):
@@ -758,7 +758,7 @@ def get_module_names(thread):
return thread.GetFrameAtIndex(
i).GetModule().GetFileSpec().GetFilename()
- return map(GetModuleName, range(thread.GetNumFrames()))
+ return [GetModuleName(i) for i in range(thread.GetNumFrames())]
def get_stack_frames(thread):
@@ -768,7 +768,7 @@ def get_stack_frames(thread):
def GetStackFrame(i):
return thread.GetFrameAtIndex(i)
- return map(GetStackFrame, range(thread.GetNumFrames()))
+ return [GetStackFrame(i) for i in range(thread.GetNumFrames())]
def print_stacktrace(thread, string_buffer=False):
Modified: lldb/trunk/utils/vim-lldb/python-vim-lldb/lldb_controller.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/utils/vim-lldb/python-vim-lldb/lldb_controller.py?rev=356647&r1=356646&r2=356647&view=diff
==============================================================================
--- lldb/trunk/utils/vim-lldb/python-vim-lldb/lldb_controller.py (original)
+++ lldb/trunk/utils/vim-lldb/python-vim-lldb/lldb_controller.py Thu Mar 21 00:19:09 2019
@@ -102,8 +102,8 @@ class LLDBController(object):
pass
if result.GetSize() > 0:
- results = filter(None, [result.GetStringAtIndex(x)
- for x in range(result.GetSize())])
+ results = [_f for _f in [result.GetStringAtIndex(x)
+ for x in range(result.GetSize())] if _f]
return results
else:
return []
More information about the lldb-commits
mailing list