From 50c385f460af40d2976b98ba34a1485541bf8618 Mon Sep 17 00:00:00 2001
From: hazelnutsgz <guozhen.she@intel.com>
Date: Sun, 14 Oct 2018 15:52:36 +0800
Subject: [PATCH] Fix the compatible issues related to filter function in
 stx-gui

Change-Id: I028818042952bc45e8b0edd843759b394cd43ae6
Story: 2003432
Task: 24628
---
 .../dashboards/admin/inventory/interfaces/forms.py  | 13 ++++++-------
 .../dashboards/admin/inventory/sensors/tables.py    |  2 +-
 .../dashboards/admin/inventory/tables.py            | 10 +++++-----
 .../dashboards/admin/software_management/tables.py  |  2 +-
 .../dashboards/admin/software_management/views.py   |  4 ++--
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/forms.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/forms.py
index ae7955cd..b77e7469 100644
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/forms.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/forms.py
@@ -497,15 +497,14 @@ class AddInterface(forms.SelfHandlingForm):
             cleaned_data.pop('ipv6_pool', None)
 
         if ifclass == 'data':
-            providernetworks = filter(
-                None, cleaned_data.get('providernetworks_data', []))
+            providernetworks = [_f for _f in cleaned_data.get(
+                'providernetworks_data', []) if _f]
         elif ifclass == 'pci-passthrough':
-            providernetworks = filter(None, cleaned_data.get(
-                'providernetworks_pci', []))
+            providernetworks = [_f for _f in cleaned_data.get(
+                'providernetworks_pci', []) if _f]
         elif ifclass == 'pci-sriov':
-            providernetworks = filter(
-                None,
-                cleaned_data.get('providernetworks_sriov', []))
+            providernetworks = [_f for _f in cleaned_data.get(
+                'providernetworks_sriov', []) if _f]
         else:
             providernetworks = []
 
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/sensors/tables.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/sensors/tables.py
index bcb3fdfd..41b8e9e3 100755
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/sensors/tables.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/sensors/tables.py
@@ -362,7 +362,7 @@ class SensorsFilterAction(tables.FilterAction):
                 return True
             return False
 
-        return filter(comp, sensors)
+        return list(filter(comp, sensors))
 
 
 class SensorsTable(tables.DataTable):
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/tables.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/tables.py
index b0401628..1be8eeb1 100755
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/tables.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/tables.py
@@ -590,7 +590,7 @@ class HostsStorageFilterAction(tables.FilterAction):
                 return True
             return False
 
-        return filter(comp, hosts)
+        return list(filter(comp, hosts))
 
 
 class HostsComputeFilterAction(tables.FilterAction):
@@ -675,10 +675,10 @@ def get_task_or_status(host):
         patch_state = ""
 
     return _("%s") % "<br />".join(
-        filter(None, [task_or_status,
-                      patch_current,
-                      reboot_required,
-                      patch_state]))
+        [_f for _f in [task_or_status,
+                       patch_current,
+                       reboot_required,
+                       patch_state] if _f])
 
 
 TASK_STATE_CHOICES = (
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/tables.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/tables.py
index 47b508ba..344069ee 100755
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/tables.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/tables.py
@@ -152,7 +152,7 @@ class PatchFilterAction(tables.FilterAction):
                 return True
             return False
 
-        return filter(comp, patches)
+        return list(filter(comp, patches))
 
 
 class PatchesTable(tables.DataTable):
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/views.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/views.py
index e52d6c0a..e35785cb 100755
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/views.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/views.py
@@ -56,9 +56,9 @@ class DetailPatchView(views.HorizonTemplateView):
             try:
                 patch = stx_api.patch.get_patch(self.request, patch_id)
                 patch.contents_display = "%s" % "\n".join(
-                    filter(None, patch.contents))
+                    [_f for _f in patch.contents if _f])
                 patch.requires_display = "%s" % "\n".join(
-                    filter(None, patch.requires))
+                    [_f for _f in patch.requires if _f])
             except Exception:
                 redirect = reverse(self.failure_url)
                 exceptions.handle(self.request,