Merge "Fix filter() usage due to python 3 compability"

openstack/common/config/generator.py

@@ -67,10 +67,8 @@ def generate(srcfiles):
                             os.path.basename(filepath).split('.')[0]])
         mods_by_pkg.setdefault(pkg_name, list()).append(mod_str)
     # NOTE(lzyeval): place top level modules before packages
-    pkg_names = filter(lambda x: x.endswith(PY_EXT), mods_by_pkg.keys())
-    pkg_names.sort()
-    ext_names = filter(lambda x: x not in pkg_names, mods_by_pkg.keys())
-    ext_names.sort()
+    pkg_names = sorted(pkg for pkg in mods_by_pkg if pkg.endswith(PY_EXT))
+    ext_names = sorted(pkg for pkg in mods_by_pkg if pkg not in pkg_names)
     pkg_names.extend(ext_names)
 
     # opts_by_group is a mapping of group name to an options list

openstack/common/eventlet_backdoor.py

@@ -64,7 +64,7 @@ def _dont_use_this():
 
 
 def _find_objects(t):
-    return filter(lambda o: isinstance(o, t), gc.get_objects())
+    return [o for o in gc.get_objects() if isinstance(o, t)]
 
 
 def _print_greenthreads():

openstack/common/report/utils.py

@@ -43,4 +43,4 @@ def _find_objects(t):
     :returns: a list of objects of the given type
     """
 
-    return filter(lambda o: isinstance(o, t), gc.get_objects())
+    return [o for o in gc.get_objects() if isinstance(o, t)]

tests/unit/db/sqlalchemy/test_utils.py

@@ -458,8 +458,8 @@ class TestMigrationUtils(test_migrations.BaseMigrationTestCase):
             meta = MetaData()
             meta.bind = engine
             test_table = Table(table_name, meta, autoload=True)
-            constraints = filter(
-                lambda c: c.name == uc_name, test_table.constraints)
+            constraints = [c for c in test_table.constraints
+                           if c.name == uc_name]
             self.assertEqual(len(constraints), 0)
             self.assertEqual(len(test_table.constraints), 1)
 
@@ -515,8 +515,7 @@ class TestMigrationUtils(test_migrations.BaseMigrationTestCase):
         # NOTE(boris-42): Update data about Table from DB.
         meta = MetaData(bind=engine)
         test_table = Table(table_name, meta, autoload=True)
-        constraints = filter(
-            lambda c: c.name == uc_name, test_table.constraints)
+        constraints = [c for c in test_table.constraints if c.name == uc_name]
         self.assertEqual(len(constraints), 0)
         self.assertEqual(len(test_table.constraints), 1)
         test_table.drop()