diff options
| author | Serge Guelton <sguelton@redhat.com> | 2019-03-21 07:19:09 +0000 |
|---|---|---|
| committer | Serge Guelton <sguelton@redhat.com> | 2019-03-21 07:19:09 +0000 |
| commit | 32cffcf1aba9e5ac3315556b852e9c8ea6da64e7 (patch) | |
| tree | e8bf3aae50d6306224b89993d01030b2e8fae90c /lldb/utils | |
| parent | 8de7bc0bff05a5d5bc5d8849687993234f5e0ea9 (diff) | |
| download | bcm5719-llvm-32cffcf1aba9e5ac3315556b852e9c8ea6da64e7.tar.gz bcm5719-llvm-32cffcf1aba9e5ac3315556b852e9c8ea6da64e7.zip | |
Use list comprehension instead of map/filter to prepare Python2/3 compat
Differential Revision: https://reviews.llvm.org/D59579
llvm-svn: 356647
Diffstat (limited to 'lldb/utils')
| -rw-r--r-- | lldb/utils/lui/lldbutil.py | 16 | ||||
| -rw-r--r-- | lldb/utils/vim-lldb/python-vim-lldb/lldb_controller.py | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/lldb/utils/lui/lldbutil.py b/lldb/utils/lui/lldbutil.py index cd608ba48e8..80d581c766d 100644 --- a/lldb/utils/lui/lldbutil.py +++ b/lldb/utils/lui/lldbutil.py @@ -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): diff --git a/lldb/utils/vim-lldb/python-vim-lldb/lldb_controller.py b/lldb/utils/vim-lldb/python-vim-lldb/lldb_controller.py index ed54633a3ea..b36769f5a57 100644 --- a/lldb/utils/vim-lldb/python-vim-lldb/lldb_controller.py +++ b/lldb/utils/vim-lldb/python-vim-lldb/lldb_controller.py @@ -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 [] |
