changeset 1359:8fb419235dc9

some py3 compatibility Ignore-this: 2175eb9b2e4f93e5de3f835914943803 darcs-hash:d6f647a108dfbc9f7d1e146f25b199c5de5ffc6c
author drewp <drewp@bigasterisk.com>
date Wed, 01 May 2019 00:03:00 -0700
parents fda1e7bdecb7
children 19b71e86654c
files lib/mqtt_client/mqtt_client.py
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lib/mqtt_client/mqtt_client.py	Tue Apr 30 23:37:30 2019 -0700
+++ b/lib/mqtt_client/mqtt_client.py	Wed May 01 00:03:00 2019 -0700
@@ -42,12 +42,13 @@
         log.warn("Connection to broker lost: %r", reason)
         self.whenConnected().addCallback(self.connectToBroker)
 
-    def publish(self, topic, msg):
+    def publish(self, topic: bytes, msg: bytes):
         def _logFailure(failure):
             log.warn("publish failed: %s", failure.getErrorMessage())
             return failure
 
-        return self.protocol.publish(topic=topic, qos=0, message=msg).addErrback(_logFailure)
+        return self.protocol.publish(topic=bytearray(topic), qos=0,
+                                     message=bytearray(msg)).addErrback(_logFailure)
 
 
 class MqttClient(object):
@@ -64,7 +65,7 @@
     def publish(self, topic, msg):
         return self.serv.publish(topic, msg)
 
-    def subscribe(self, topic):
+    def subscribe(self, topic: bytes):
         """returns rx.Observable of payload strings"""
         # This is surely broken for multiple topics and subscriptions. Might not even
         # work over a reconnect.
@@ -80,7 +81,7 @@
     def _resubscribe(self, topic):
         log.info('subscribing %r', topic)
         self.serv.protocol.onPublish = self._onPublish
-        return self.serv.protocol.subscribe(topic, 2)
+        return self.serv.protocol.subscribe(topics=[(topic, 2)])
         
     def _observe_msgs(self, observer):
         self.obs = observer