Merge "Support python3 in all plugins"

1 files changed, 9 insertions, 7 deletions

diff --git a/dmaap/dmaapcontrollerif/dmaap_requests.py b/dmaap/dmaapcontrollerif/dmaap_requests.py
index 231953a..0f02594 100644
--- a/dmaap/dmaapcontrollerif/dmaap_requests.py
+++ b/dmaap/dmaapcontrollerif/dmaap_requests.py
@@ -2,6 +2,7 @@
 # org.onap.ccsdk
 # =============================================================================
 # Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2020 Pantheon.tech. All rights reserved.
 # =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -287,14 +288,15 @@ class DMaaPControllerHandle(object):
         locations.raise_for_status()
 
         # pull out location names for VALID locations with matching dcae_layer
-        return  map(lambda l: l["dcaeLocationName"],
-                    filter(lambda i : (i['dcaeLayer'] == dcae_layer and i['status'] == 'VALID'),
-                       locations.json()))
+        return [location["dcaeLocationName"] for location in locations.json()
+                if location['dcaeLayer'] == dcae_layer
+                and location['status'] == 'VALID']
 
     def get_dcae_central_locations(self):
         '''
         Get the list of location names known to the DMaaP bus controller
-        whose "dcaeLayer" property contains "central" (ignoring case) and whose status is "VALID".
+        whose "dcaeLayer" property contains "central" (ignoring case)
+        and whose status is "VALID".
         "dcaeLayer" contains "central" for central sites.
         '''
         # Do these as a separate step so things like 404 get reported precisely
@@ -302,7 +304,7 @@ class DMaaPControllerHandle(object):
         locations.raise_for_status()
 
         # pull out location names for VALID central locations
-        return  map(lambda l: l["dcaeLocationName"],
-                    filter(lambda i : ('central' in i['dcaeLayer'].lower() and i['status'] == 'VALID'),
-                       locations.json()))
+        return [location["dcaeLocationName"] for location in locations.json()
+                if 'central' in location['dcaeLayer'].lower()
+                and location['status'] == 'VALID']