Merge "Python3 common patterns"

4 files changed, 8 insertions, 8 deletions

diff --git a/cinderclient/shell.py b/cinderclient/shell.py
index 5f56a4c..4ba2f81 100644
--- a/cinderclient/shell.py
+++ b/cinderclient/shell.py
@@ -952,8 +952,8 @@ def main():
         if sys.version_info >= (3, 0):
             OpenStackCinderShell().main(sys.argv[1:])
         else:
-            OpenStackCinderShell().main(map(encodeutils.safe_decode,
-                                            sys.argv[1:]))
+            OpenStackCinderShell().main([encodeutils.safe_decode(item)
+                                        for item in sys.argv[1:]])
     except KeyboardInterrupt:
         print("... terminating cinder client", file=sys.stderr)
         sys.exit(130)
diff --git a/cinderclient/tests/unit/v1/fakes.py b/cinderclient/tests/unit/v1/fakes.py
index 2f7cb64..13f1639 100644
--- a/cinderclient/tests/unit/v1/fakes.py
+++ b/cinderclient/tests/unit/v1/fakes.py
@@ -712,9 +712,9 @@ class FakeHTTPClient(base_client.HTTPClient):
             },
         ]
         if host:
-            services = filter(lambda i: i['host'] == host, services)
+            services = [i for i in services if i['host'] == host]
         if binary:
-            services = filter(lambda i: i['binary'] == binary, services)
+            services = [i for i in services if i['binary'] == binary]
         return (200, {}, {'services': services})
 
     def put_os_services_enable(self, body, **kw):
diff --git a/cinderclient/tests/unit/v2/fakes.py b/cinderclient/tests/unit/v2/fakes.py
index 2bd1aaf..6978a62 100644
--- a/cinderclient/tests/unit/v2/fakes.py
+++ b/cinderclient/tests/unit/v2/fakes.py
@@ -1079,9 +1079,9 @@ class FakeHTTPClient(base_client.HTTPClient):
             },
         ]
         if host:
-            services = filter(lambda i: i['host'] == host, services)
+            services = [i for i in services if i['host'] == host]
         if binary:
-            services = filter(lambda i: i['binary'] == binary, services)
+            services = [i for i in services if i['binary'] == binary]
         return (200, {}, {'services': services})
 
     def put_os_services_enable(self, body, **kw):
diff --git a/cinderclient/tests/unit/v3/fakes.py b/cinderclient/tests/unit/v3/fakes.py
index 060b697..39b2cf0 100644
--- a/cinderclient/tests/unit/v3/fakes.py
+++ b/cinderclient/tests/unit/v3/fakes.py
@@ -116,9 +116,9 @@ class FakeHTTPClient(fake_v2.FakeHTTPClient):
             },
         ]
         if host:
-            services = list(filter(lambda i: i['host'] == host, services))
+            services = [i for i in services if i['host'] == host]
         if binary:
-            services = list(filter(lambda i: i['binary'] == binary, services))
+            services = [i for i in services if i['binary'] == binary]
         if not self.api_version.matches('3.7'):
             for svc in services:
                 del svc['cluster']