Fix linter errors

This commit is contained in:
raspberry
2018-02-22 11:03:57 +03:00
parent 0f9a759839
commit b9e940e9de
3 changed files with 4 additions and 14 deletions
+1 -3
View File
@@ -52,8 +52,6 @@ def read_motion_data(gateway, client, polling_interval, polling_models, stop_eve
continue continue
data = json.loads(sensor_resp['data']) data = json.loads(sensor_resp['data'])
state = data.get("status", None)
short_id = sensor_resp['short_id']
if device['data'] != data or first: if device['data'] != data or first:
device['data'] = data device['data'] = data
_LOGGER.debug("Polling result differs for " + str(model) + " with sid(First: " + str(first) + "): " + str(sid) + "; " + str(data)) _LOGGER.debug("Polling result differs for " + str(model) + " with sid(First: " + str(first) + "): " + str(sid) + "; " + str(data))
@@ -75,7 +73,7 @@ def process_mqtt_messages(gateway, client, stop_event):
sid = data.get("sid", None) sid = data.get("sid", None)
values = data.get("values", dict()) values = data.get("values", dict())
resp = gateway.write_to_hub(sid, **values) gateway.write_to_hub(sid, **values)
client._queue.task_done() client._queue.task_done()
except Exception as e: except Exception as e:
_LOGGER.error('Error while sending from mqtt to gateway: ', str(e)) _LOGGER.error('Error while sending from mqtt to gateway: ', str(e))
+2 -10
View File
@@ -1,5 +1,4 @@
import paho.mqtt.client as mqtt import paho.mqtt.client as mqtt
import os
import logging import logging
from queue import Queue from queue import Queue
from threading import Thread from threading import Thread
@@ -89,7 +88,7 @@ class Mqtt:
if (model in self.event_based_sensors): if (model in self.event_based_sensors):
retain = False retain = False
# fix for rgb format # fix for rgb format
if (key == "rgb" and self._is_int(value)): if (key == "rgb" and value.isdigit()):
value = self._color_xiaomi_to_rgb(value) value = self._color_xiaomi_to_rgb(value)
items[key] = value items[key] = value
@@ -157,7 +156,7 @@ class Mqtt:
# use single value set method # use single value set method
value = (msg.payload).decode('utf-8') value = (msg.payload).decode('utf-8')
if self._is_int(value): if value.isdigit():
value = int(value) value = int(value)
# fix for rgb format # fix for rgb format
@@ -202,10 +201,3 @@ class Mqtt:
bright = 255 bright = 255
value = int('%02x%02x%02x%02x' % (bright, r, g, b), 16) value = int('%02x%02x%02x%02x' % (bright, r, g, b), 16)
return value return value
def _is_int(self, x):
try:
tmp = int(x)
return True
except Exception as e:
return False
+1 -1
View File
@@ -237,7 +237,7 @@ class XiaomiHub:
if isinstance(packet, dict): if isinstance(packet, dict):
try: try:
sid = packet['sid'] sid = packet['sid']
model = packet['model'] #model = packet['model']
data = json.loads(packet['data']) data = json.loads(packet['data'])
for device in self.XIAOMI_HA_DEVICES[sid]: for device in self.XIAOMI_HA_DEVICES[sid]: