From ff830385490de2e7316cfea304459e0dbc4dbd2e Mon Sep 17 00:00:00 2001
From: Ha Van Tu <tuhv@vn.fujitsu.com>
Date: Tue, 30 Aug 2016 11:42:06 +0700
Subject: [PATCH] Fix using filter() to meet python2,3

As mentioned in link[1], if we need filter on python3,
Replace filter(lambda obj: test(obj), data) with:
[obj for obj in data if test(obj)]. [1]

https://wiki.openstack.org/wiki/Python3

Change-Id: I557bb18519725a9c23cf816d49d717e2e7c1ab59
---
 glance/common/rpc.py        | 2 +-
 glance/db/simple/api.py     | 2 +-
 glance/db/sqlalchemy/api.py | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/glance/common/rpc.py b/glance/common/rpc.py
index 26fdad6f88..06f651a377 100644
--- a/glance/common/rpc.py
+++ b/glance/common/rpc.py
@@ -134,7 +134,7 @@ class Controller(object):
 
         """
 
-        funcs = filter(lambda x: not x.startswith("_"), dir(resource))
+        funcs = [x for x in dir(resource) if not x.startswith("_")]
 
         if filtered:
             funcs = [f for f in funcs if f in filtered]
diff --git a/glance/db/simple/api.py b/glance/db/simple/api.py
index 5f30562f4e..fd3d5ee527 100644
--- a/glance/db/simple/api.py
+++ b/glance/db/simple/api.py
@@ -667,7 +667,7 @@ def _normalize_locations(context, image, force_show_deleted=False):
     if force_show_deleted:
         locations = image['locations']
     else:
-        locations = filter(lambda x: not x['deleted'], image['locations'])
+        locations = [x for x in image['locations'] if not x['deleted']]
     image['locations'] = [{'id': loc['id'],
                            'url': loc['url'],
                            'metadata': loc['metadata'],
diff --git a/glance/db/sqlalchemy/api.py b/glance/db/sqlalchemy/api.py
index 2380d1cc91..1d9bda0941 100644
--- a/glance/db/sqlalchemy/api.py
+++ b/glance/db/sqlalchemy/api.py
@@ -199,7 +199,7 @@ def _normalize_locations(context, image, force_show_deleted=False):
     if force_show_deleted:
         locations = image['locations']
     else:
-        locations = filter(lambda x: not x.deleted, image['locations'])
+        locations = [x for x in image['locations'] if not x.deleted]
     image['locations'] = [{'id': loc['id'],
                            'url': loc['value'],
                            'metadata': loc['meta_data'],
@@ -209,7 +209,7 @@ def _normalize_locations(context, image, force_show_deleted=False):
 
 
 def _normalize_tags(image):
-    undeleted_tags = filter(lambda x: not x.deleted, image['tags'])
+    undeleted_tags = [x for x in image['tags'] if not x.deleted]
     image['tags'] = [tag['value'] for tag in undeleted_tags]
     return image