Fix new binary operator pycodestyle

Ref #279
Alignak-monitoring-contrib · Apr 11, 2018 · f58db0c · f58db0c
1 parent a8d0442
commit f58db0c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/alignak_app/qobjects/host/host.py b/alignak_app/qobjects/host/host.py
@@ -441,13 +441,14 @@ def update_host(self, host_item=None):
             )
             self.labels['host_name'].setText('%s' % self.host_item.get_display_name())
 
+            monitored = self.host_item.data[
+                'passive_checks_enabled'] + self.host_item.data['active_checks_enabled']
             icon_name = get_icon_name(
                 'host',
                 self.host_item.data['ls_state'],
                 self.host_item.data['ls_acknowledged'],
                 self.host_item.data['ls_downtimed'],
-                self.host_item.data['passive_checks_enabled'] +
-                self.host_item.data['active_checks_enabled']
+                monitored
             )
             pixmap_icon = QPixmap(settings.get_image(icon_name))
             final_icon = pixmap_icon.scaled(32, 32, Qt.KeepAspectRatio)

diff --git a/alignak_app/qobjects/service/service.py b/alignak_app/qobjects/service/service.py
@@ -180,13 +180,14 @@ def update_widget(self, service):
 
         self.service_item = service
 
+        monitored = self.service_item.data[
+            'passive_checks_enabled'] + self.service_item.data['active_checks_enabled']
         icon_name = get_icon_name(
             'service',
             self.service_item.data['ls_state'],
             self.service_item.data['ls_acknowledged'],
             self.service_item.data['ls_downtimed'],
-            self.service_item.data['passive_checks_enabled'] +
-            self.service_item.data['active_checks_enabled']
+            monitored
         )
         icon_pixmap = QPixmap(settings.get_image(icon_name))
 

diff --git a/alignak_app/qobjects/service/tree_item.py b/alignak_app/qobjects/service/tree_item.py
@@ -58,13 +58,14 @@ def initialize(self, service_item):
         self.service_id = service_item.item_id
         self.setText(0, self.service_item.get_display_name())
 
+        monitored = service_item.data[
+            'passive_checks_enabled'] + service_item.data['active_checks_enabled']
         icon_name = get_icon_name(
             'service',
             service_item.data['ls_state'],
             service_item.data['ls_acknowledged'],
             service_item.data['ls_downtimed'],
-            service_item.data['passive_checks_enabled'] +
-            service_item.data['active_checks_enabled']
+            monitored
         )
 
         self.setIcon(0, QIcon(settings.get_image(icon_name)))
@@ -77,13 +78,14 @@ def update_item(self):
 
         service = data_manager.get_item('service', '_id', self.service_id)
 
+        monitored = self.service_item.data[
+            'passive_checks_enabled'] + self.service_item.data['active_checks_enabled']
         icon_name = get_icon_name(
             'service',
             self.service_item.data['ls_state'],
             self.service_item.data['ls_acknowledged'],
             self.service_item.data['ls_downtimed'],
-            self.service_item.data['passive_checks_enabled'] +
-            self.service_item.data['active_checks_enabled']
+            monitored
         )
 
         self.setData(0, 0, service.get_display_name())