Fix pylint

Author: shenxn

libpurecool/dyson_360_eye.py

@@ -7,7 +7,7 @@
 
 import paho.mqtt.client as mqtt
 
-from .dyson_device import DysonDevice, NetworkDevice, DEFAULT_PORT
+from .dyson_device import DysonDevice
 from .utils import printable_fields
 from .const import PowerMode, Dyson360EyeMode, Dyson360EyeCommand
 
@@ -31,18 +31,6 @@ def _device_serial_from_name(name):
         """Get device serial from mDNS name."""
         return (name.split(".")[0]).split("-", 1)[1]
 
-    def connect(self, device_ip, device_port=DEFAULT_PORT):
-        """Try to connect to device.
-
-        :param device_ip: Device IP address
-        :param device_port: Device Port (default: 1883)
-        :return: True if connected, else False
-        """
-        self._network_device = NetworkDevice(self._name, device_ip,
-                                             device_port)
-
-        return self._mqtt_connect()
-
     def _mqtt_connect(self):
         """Connect to the MQTT broker."""
         self._mqtt = mqtt.Client(userdata=self, protocol=3)

libpurecool/dyson_device.py

@@ -146,15 +146,17 @@ def connection_callback(self, connected):
         """Set function called when device is connected."""
         self._connection_queue.put_nowait(connected)
 
-    @abc.abstractmethod
     def connect(self, device_ip, device_port=DEFAULT_PORT):
         """Connect to the device using ip address.
 
         :param device_ip: Device IP address
         :param device_port: Device Port (default: 1883)
         :return: True if connected, else False
         """
-        return
+        self._network_device = NetworkDevice(self._name, device_ip,
+                                             device_port)
+
+        return self._mqtt_connect()
 
     def _auto_connect(self, type_, timeout=5, retry=15):
         """Try to connect to device using mDNS."""
@@ -179,6 +181,11 @@ def _auto_connect(self, type_, timeout=5, retry=15):
             return False
         return self._mqtt_connect()
 
+    @abc.abstractmethod
+    def _mqtt_connect(self):
+        """Connect to the MQTT broker."""
+        return
+
     @staticmethod
     @abc.abstractmethod
     def _device_serial_from_name(name):

libpurecool/dyson_pure_cool_link.py

@@ -14,7 +14,7 @@
 from .dyson_pure_state_v2 import \
     DysonEnvironmentalSensorV2State, DysonPureCoolV2State, \
     DysonPureHotCoolV2State
-from .dyson_device import DysonDevice, NetworkDevice, DEFAULT_PORT
+from .dyson_device import DysonDevice
 from .utils import printable_fields, support_heating, is_pure_cool_v2, \
     support_heating_v2
 from .dyson_pure_state import DysonPureHotCoolState, DysonPureCoolState, \
@@ -90,18 +90,6 @@ def _device_serial_from_name(name):
         """Get device serial from mDNS name."""
         return (name.split(".")[0]).split("_")[1]
 
-    def connect(self, device_ip, device_port=DEFAULT_PORT):
-        """Connect to the device using ip address.
-
-        :param device_ip: Device IP address
-        :param device_port: Device Port (default: 1883)
-        :return: True if connected, else False
-        """
-        self._network_device = NetworkDevice(self._name, device_ip,
-                                             device_port)
-
-        return self._mqtt_connect()
-
     def _mqtt_connect(self):
         """Connect to the MQTT broker."""
         self._mqtt = mqtt.Client(userdata=self)

tests/test_360_eye.py

@@ -4,9 +4,10 @@
 from unittest.mock import Mock
 import json
 
-from libpurecool.dyson_360_eye import Dyson360Eye, NetworkDevice, \
+from libpurecool.dyson_360_eye import Dyson360Eye, \
     Dyson360EyeState, Dyson360EyeMapGlobal, Dyson360EyeMapData, \
     Dyson360EyeMapGrid, Dyson360EyeTelemetryData, Dyson360Goodbye
+from libpurecool.dyson_device import NetworkDevice
 from libpurecool.const import PowerMode, Dyson360EyeMode