Use list comprehension instead of map/filter to prepare Python2/3 compat

Differential Revision: https://reviews.llvm.org/D59579

llvm-svn: 356647

2 files changed, 4 insertions, 6 deletions

diff --git a/lldb/scripts/analyze-project-deps.py b/lldb/scripts/analyze-project-deps.py
index b7f6e6803d0..c6e3263a2f2 100755
--- a/lldb/scripts/analyze-project-deps.py
+++ b/lldb/scripts/analyze-project-deps.py
@@ -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_dir):
 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:
diff --git a/lldb/scripts/swig_bot_lib/local.py b/lldb/scripts/swig_bot_lib/local.py
index b26ea2f53ea..ea073af8257 100644
--- a/lldb/scripts/swig_bot_lib/local.py
+++ b/lldb/scripts/swig_bot_lib/local.py
@@ -54,10 +54,8 @@ def pack_archive(bytes_io, src_root, filters):
             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):