Fixes for the API change of construct v2.9.30 (#220)

* Fixes for the API change of construct v2.9.30.

construct==2.9.30 pinned.

* Backward compatible solution used.

* Range of compatible construct versions added.

Author: syssi

miio/chuangmi_ir.py

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

miio/protocol.py

@@ -130,24 +130,24 @@ def is_hello(x) -> bool:
 
 class TimeAdapter(Adapter):
     """Adapter for timestamp conversion."""
-    def _encode(self, obj, context):
+    def _encode(self, obj, context, *args, **kwargs):
         return calendar.timegm(obj.timetuple())
 
-    def _decode(self, obj, context):
+    def _decode(self, obj, context, *args, **kwargs):
         return datetime.datetime.utcfromtimestamp(obj)
 
 
 class EncryptionAdapter(Adapter):
     """Adapter to handle communication encryption."""
-    def _encode(self, obj, context):
+    def _encode(self, obj, context, *args, **kwargs):
         """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):
+    def _decode(self, obj, context, *args, **kwargs):
         """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
+construct>=2.9.23,<=2.9.30
 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',
+    install_requires=['construct>=2.9.23,<=2.9.30',
                       'click',
                       'cryptography',
                       'pretty_cron',