Construct related, support upto 2.9.31

miio/chuangmi_ir.py

@@ -130,10 +130,10 @@ def play(self, command: str):
 
 
 class ProntoPulseAdapter(Adapter):
-    def _decode(self, obj, context, *args, **kwargs):
+    def _decode(self, obj, context, path):
         return int(obj * context._.modulation_period)
 
-    def _encode(self, obj, context, *args, **kwargs):
+    def _encode(self, obj, context, path):
         raise RuntimeError('Not implemented')
 
 

miio/device.py

@@ -3,6 +3,7 @@
 import socket
 import logging
 import construct
+import binascii
 from typing import Any, List, Optional  # noqa: F401
 
 from .protocol import Message
@@ -133,7 +134,7 @@ def do_discover(self) -> Message:
         :raises DeviceException: if the device could not be discovered."""
         m = Device.discover(self.ip)
         if m is not None:
-            self._device_id = m.header.value.device_id
+            self._device_id = binascii.hexlify(m.header.value.device_id)
             self._device_ts = m.header.value.ts
             self._discovered = True
             if self.debug > 1:
@@ -184,7 +185,7 @@ def discover(addr: str=None) -> Any:
                 if addr[0] not in seen_addrs:
                     _LOGGER.info("  IP %s (ID: %s) - token: %s",
                                  addr[0],
-                                 m.header.value.device_id.decode(),
+                                 binascii.hexlify(m.header.value.device_id).decode(),
                                  codecs.encode(m.checksum, 'hex'))
                     seen_addrs.append(addr[0])
             except socket.timeout:

miio/protocol.py

@@ -20,10 +20,7 @@
 
 from construct import (Struct, Bytes, Const, Int16ub, Int32ub, GreedyBytes,
                        Adapter, Checksum, RawCopy, Rebuild, IfThenElse,
-                       Default, Pointer, Hex)
-
-# for debugging parsing
-# from construct import Probe
+                       Default, Pointer, Hex, Probe)
 
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 from cryptography.hazmat.backends import default_backend
@@ -130,24 +127,24 @@ def is_hello(x) -> bool:
 
 class TimeAdapter(Adapter):
     """Adapter for timestamp conversion."""
-    def _encode(self, obj, context, *args, **kwargs):
+    def _encode(self, obj, context, path):
         return calendar.timegm(obj.timetuple())
 
-    def _decode(self, obj, context, *args, **kwargs):
+    def _decode(self, obj, context, path):
         return datetime.datetime.utcfromtimestamp(obj)
 
 
 class EncryptionAdapter(Adapter):
     """Adapter to handle communication encryption."""
-    def _encode(self, obj, context, *args, **kwargs):
+    def _encode(self, obj, context, path):
         """Encrypt the given payload with the token stored in the context.
 
         :param obj: JSON object to encrypt"""
         # pp(context)
         return Utils.encrypt(json.dumps(obj).encode('utf-8') + b'\x00',
                              context['_']['token'])
 
-    def _decode(self, obj, context, *args, **kwargs):
+    def _decode(self, obj, context, path):
         """Decrypts the given payload with the token stored in the context.
 
         :return str: JSON object"""

requirements.txt

@@ -1,7 +1,7 @@
 click
 cryptography
 pretty_cron
-construct>=2.9.23,<=2.9.30
+construct>=2.9.30,<=2.9.31
 zeroconf
 attrs
 typing  # for py3.4 support

setup.py

@@ -42,7 +42,7 @@ def readme():
     packages=["miio", "mirobo"],
 
     python_requires='>=3.4',
-    install_requires=['construct>=2.9.23,<=2.9.30',
+    install_requires=['construct>=2.9.30,<=2.9.31',
                       'click',
                       'cryptography',
                       'pretty_cron',