Merge branch 'develop'

ChangeLog.txt

-v1.1.1 - 2015-xx-xx
-===================
+v1.2 - 2016-06-03
+=================
 
+- Client.publish() now returns an MQTTMessageInfo object. The MQTTMessageInfo
+  object behaves like a tuple of (rc, mid) for backwards compatibility but
+  also provides two functions: is_published() and wait_for_published().
+  This allows a client to determine whether any given message has been
+  published without need for a callback, and also allows the client to block
+  waiting until the message has been sent.
 - Further fix for Client constructor for the case where "localhost" is
   unresolvable.
+- Add paho.mqtt.subscribe module, with simple() and callback() helper
+  functions.
+- Allow ^C to interrupt client loop.
+- Fix for keepalive=0 causing an infinite disconnect/reconnect loop. Closes
+  #42.
+- Modify callbacks definition/structure to allow classical inheritence. Closes
+  #53, #54.
+- Add websockets support.
+- Default MQTT version is again changed to v3.1.1.
+- Client.subscribe() now accepts unicode type topic inputs on Python 2. Closes
+  #16.
+- paho.mqtt.publish() now raises an MQTTException on a CONNECT failure, rather
+  than blindly continuing. Closes #6.
+- Don't block on TLS sockets on Python 3. Closes #2.
+- Client.publish() now accepts bytes() payloads on Python 3. Closes #1.
+- Don't attempt to join() own thread. Closes #14.
+- Allow the use of Client.message_callback_add() from inside callbacks. Closes
+  #12.
+- Use a monotonic time source for keeping track of time, if available. Closes
+  #56.
 
 
 v1.1 - 2015-01-30

examples/pub-wait.py

+#!/usr/bin/python3.5
+
+# Copyright (c) 2010-2013 Roger Light <roger@atchoo.org>
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Distribution License v1.0
+# which accompanies this distribution. 
+#
+# The Eclipse Distribution License is available at 
+#   http://www.eclipse.org/org/documents/edl-v10.php.
+#
+# Contributors:
+#    Roger Light - initial implementation
+# Copyright (c) 2010,2011 Roger Light <roger@atchoo.org>
+# All rights reserved.
+
+# This shows a simple example of an MQTT subscriber.
+
+import sys
+import time
+try:
+    import paho.mqtt.client as mqtt
+except ImportError:
+    # This part is only required to run the example from within the examples
+    # directory when the module itself is not installed.
+    #
+    # If you have the module installed, just use "import paho.mqtt.client"
+    import os
+    import inspect
+    cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0], "../src")))
+    if cmd_subfolder not in sys.path:
+        sys.path.insert(0, cmd_subfolder)
+    import paho.mqtt.client as mqtt
+
+def on_connect(mqttc, obj, flags, rc):
+    print("rc: "+str(rc))
+
+def on_message(mqttc, obj, msg):
+    print(msg.topic+" "+str(msg.qos)+" "+str(msg.payload))
+
+def on_publish(mqttc, obj, mid):
+    print("mid: "+str(mid))
+    pass
+
+def on_subscribe(mqttc, obj, mid, granted_qos):
+    print("Subscribed: "+str(mid)+" "+str(granted_qos))
+
+def on_log(mqttc, obj, level, string):
+    print(string)
+
+# If you want to use a specific client id, use
+# mqttc = mqtt.Client("client-id")
+# but note that the client id must be unique on the broker. Leaving the client
+# id parameter empty will generate a random id for you.
+mqttc = mqtt.Client()
+mqttc.on_message = on_message
+mqttc.on_connect = on_connect
+mqttc.on_publish = on_publish
+mqttc.on_subscribe = on_subscribe
+# Uncomment to enable debug messages
+#mqttc.on_log = on_log
+mqttc.connect("localhost", 1883, 60)
+
+mqttc.loop_start()
+
+print("tuple")
+(rc, mid) = mqttc.publish("tuple", "bar", qos=2)
+print("class")
+infot = mqttc.publish("class", "bar", qos=2)
+
+infot.wait_for_publish()

examples/sub-callback.py

+#!/usr/bin/python
+
+# Copyright (c) 2016 Roger Light <roger@atchoo.org>
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Distribution License v1.0
+# which accompanies this distribution. 
+#
+# The Eclipse Distribution License is available at 
+#   http://www.eclipse.org/org/documents/edl-v10.php.
+#
+# Contributors:
+#    Roger Light - initial implementation
+
+# This shows an example of using the subscribe.callback helper function.
+
+import sys
+try:
+    import paho.mqtt.subscribe as subscribe
+except ImportError:
+    # This part is only required to run the example from within the examples
+    # directory when the module itself is not installed.
+    #
+    # If you have the module installed, just use "import paho.mqtt.subscribe"
+    import os
+    import inspect
+    cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"../src")))
+    if cmd_subfolder not in sys.path:
+        sys.path.insert(0, cmd_subfolder)
+    import paho.mqtt.subscribe as subscribe
+    import paho.mqtt.client
+
+def print_msg(client, userdata, message):
+    print("%s : %s" % (message.topic, message.payload))
+
+subscribe.callback(print_msg, "#", hostname="iot.eclipse.org")

examples/sub-class.py

@@ -4,9 +4,9 @@
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Distribution License v1.0
-# which accompanies this distribution. 
+# which accompanies this distribution.
 #
-# The Eclipse Distribution License is available at 
+# The Eclipse Distribution License is available at
 #   http://www.eclipse.org/org/documents/edl-v10.php.
 #
 # Contributors:
@@ -29,36 +29,30 @@ except ImportError:
         sys.path.insert(0, cmd_subfolder)
     import paho.mqtt.client as mqtt
 
-class MyMQTTClass:
-    def __init__(self, clientid=None):
-        self._mqttc = mqtt.Client(clientid)
-        self._mqttc.on_message = self.mqtt_on_message
-        self._mqttc.on_connect = self.mqtt_on_connect
-        self._mqttc.on_publish = self.mqtt_on_publish
-        self._mqttc.on_subscribe = self.mqtt_on_subscribe
+class MyMQTTClass(mqtt.Client):
 
-    def mqtt_on_connect(self, mqttc, obj, flags, rc):
+    def on_connect(self, mqttc, obj, flags, rc):
         print("rc: "+str(rc))
 
-    def mqtt_on_message(self, mqttc, obj, msg):
+    def on_message(self, mqttc, obj, msg):
         print(msg.topic+" "+str(msg.qos)+" "+str(msg.payload))
 
-    def mqtt_on_publish(self, mqttc, obj, mid):
+    def on_publish(self, mqttc, obj, mid):
         print("mid: "+str(mid))
 
-    def mqtt_on_subscribe(self, mqttc, obj, mid, granted_qos):
+    def on_subscribe(self, mqttc, obj, mid, granted_qos):
         print("Subscribed: "+str(mid)+" "+str(granted_qos))
 
-    def mqtt_on_log(self, mqttc, obj, level, string):
+    def on_log(self, mqttc, obj, level, string):
         print(string)
 
     def run(self):
-        self._mqttc.connect("m2m.eclipse.org", 1883, 60)
-        self._mqttc.subscribe("$SYS/#", 0)
+        self.connect("m2m.eclipse.org", 1883, 60)
+        self.subscribe("$SYS/#", 0)
 
         rc = 0
         while rc == 0:
-            rc = self._mqttc.loop()
+            rc = self.loop()
         return rc
 
 

examples/sub-simple.py

+#!/usr/bin/python
+
+# Copyright (c) 2016 Roger Light <roger@atchoo.org>
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Distribution License v1.0
+# which accompanies this distribution. 
+#
+# The Eclipse Distribution License is available at 
+#   http://www.eclipse.org/org/documents/edl-v10.php.
+#
+# Contributors:
+#    Roger Light - initial implementation
+
+# This shows an example of using the subscribe.simple helper function.
+
+import sys
+try:
+    import paho.mqtt.subscribe as subscribe
+except ImportError:
+    # This part is only required to run the example from within the examples
+    # directory when the module itself is not installed.
+    #
+    # If you have the module installed, just use "import paho.mqtt.subscribe"
+    import os
+    import inspect
+    cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"../src")))
+    if cmd_subfolder not in sys.path:
+        sys.path.insert(0, cmd_subfolder)
+    import paho.mqtt.subscribe as subscribe
+    import paho.mqtt.client
+
+topics = ['#']
+
+m = subscribe.simple(topics, hostname="iot.eclipse.org", retained=False, msg_count=2)
+for a in m:
+    print(a.topic)
+    print(a.payload)

examples/sub-ws.py

+#!/usr/bin/python3
+
+# Copyright (c) 2010-2013 Roger Light <roger@atchoo.org>
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Distribution License v1.0
+# which accompanies this distribution. 
+#
+# The Eclipse Distribution License is available at 
+#   http://www.eclipse.org/org/documents/edl-v10.php.
+#
+# Contributors:
+#    Roger Light - initial implementation
+# Copyright (c) 2010,2011 Roger Light <roger@atchoo.org>
+# All rights reserved.
+
+# This shows a simple example of an MQTT subscriber.
+
+import sys
+
+try:
+    import paho.mqtt.client as mqtt
+except ImportError:
+    # This part is only required to run the example from within the examples
+    # directory when the module itself is not installed.
+    #
+    # If you have the module installed, just use "import paho.mqtt.client"
+    import os
+    import inspect
+    cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"../src")))
+    if cmd_subfolder not in sys.path:
+        sys.path.insert(0, cmd_subfolder)
+    import paho.mqtt.client as mqtt
+
+def on_connect(mqttc, obj, flags, rc):
+    print("rc: "+str(rc))
+
+def on_message(mqttc, obj, msg):
+    print(msg.topic+" "+str(msg.qos)+" "+str(msg.payload))
+
+def on_publish(mqttc, obj, mid):
+    print("mid: "+str(mid))
+
+def on_subscribe(mqttc, obj, mid, granted_qos):
+    print("Subscribed: "+str(mid)+" "+str(granted_qos))
+
+def on_log(mqttc, obj, level, string):
+    print(string)
+
+# If you want to use a specific client id, use
+# mqttc = mqtt.Client("client-id")
+# but note that the client id must be unique on the broker. Leaving the client
+# id parameter empty will generate a random id for you.
+mqttc = mqtt.Client(transport="websockets")
+mqttc.on_message = on_message
+mqttc.on_connect = on_connect
+mqttc.on_publish = on_publish
+mqttc.on_subscribe = on_subscribe
+# Uncomment to enable debug messages
+mqttc.on_log = on_log
+mqttc.connect("test.mosquitto.org", 8080, 60)
+mqttc.subscribe("$SYS/broker/version", 0)
+
+
+mqttc.loop_forever()
+

setup.py

@@ -5,7 +5,7 @@ from paho.mqtt import __version__
 from distutils.core import setup
 setup(name='paho-mqtt',
 	version=__version__,
-	description='MQTT version 3.1/3.1.1 client class',
+	description='MQTT version 3.1.1 client class',
 	author='Roger Light',
 	author_email='roger@atchoo.org',
 	url='http://eclipse.org/paho',

src/paho/mqtt/__init__.py

-__version__ = "1.1"
+__version__ = "1.2"
+
+class MQTTException(Exception):
+    def __init__(self, *args, **kwargs):
+        Exception.__init__(self, *args, **kwargs)

src/paho/mqtt/publish.py

@@ -19,13 +19,13 @@ situation where you have a single/multiple messages you want to publish to a
 broker, then disconnect and nothing else is required.
 """
 
-import paho.mqtt.client as mqtt
+import paho.mqtt.client as paho
+import paho.mqtt as mqtt
 
 
 def _do_publish(c):
     """Internal function"""
-    m = c._userdata[0]
-    c._userdata = c._userdata[1:]
+    m = c._userdata.pop()
     if type(m) is dict:
         topic = m['topic']
         try:
@@ -50,7 +50,10 @@ def _do_publish(c):
 
 def _on_connect(c, userdata, flags, rc):
     """Internal callback"""
-    _do_publish(c)
+    if rc == 0:
+        _do_publish(c)
+    else:
+        raise mqtt.MQTTException(paho.connack_string(rc))
 
 
 def _on_publish(c, userdata, mid):
@@ -62,7 +65,7 @@ def _on_publish(c, userdata, mid):
 
 
 def multiple(msgs, hostname="localhost", port=1883, client_id="", keepalive=60,
-             will=None, auth=None, tls=None, protocol=mqtt.MQTTv31):
+             will=None, auth=None, tls=None, protocol=paho.MQTTv311, transport="tcp"):
     """Publish multiple messages to a broker, then disconnect cleanly.
 
     This function creates an MQTT client, connects to a broker and publishes a
@@ -110,13 +113,15 @@ def multiple(msgs, hostname="localhost", port=1883, client_id="", keepalive=60,
           default to None if not provided, which results in the client using
           the default behaviour - see the paho.mqtt.client documentation.
           Defaults to None, which indicates that TLS should not be used.
+    transport : set to "tcp" to use the default setting of transport which is
+          raw TCP. Set to "websockets" to use WebSockets as the transport.
     """
 
     if type(msgs) is not list:
         raise ValueError('msgs must be a list')
 
-    client = mqtt.Client(client_id=client_id,
-                         userdata=msgs, protocol=protocol)
+    client = paho.Client(client_id=client_id,
+                         userdata=msgs, protocol=protocol, transport=transport)
     client.on_publish = _on_publish
     client.on_connect = _on_connect
 
@@ -172,7 +177,7 @@ def multiple(msgs, hostname="localhost", port=1883, client_id="", keepalive=60,
 
 def single(topic, payload=None, qos=0, retain=False, hostname="localhost",
            port=1883, client_id="", keepalive=60, will=None, auth=None,
-           tls=None, protocol=mqtt.MQTTv31):
+           tls=None, protocol=paho.MQTTv311, transport="tcp"):
     """Publish a single message to a broker, then disconnect cleanly.
 
     This function creates an MQTT client, connects to a broker and publishes a
@@ -210,8 +215,10 @@ def single(topic, payload=None, qos=0, retain=False, hostname="localhost",
           default to None if not provided, which results in the client using
           the default behaviour - see the paho.mqtt.client documentation.
           Defaults to None, which indicates that TLS should not be used.
+    transport : set to "tcp" to use the default setting of transport which is
+          raw TCP. Set to "websockets" to use WebSockets as the transport.
     """
 
     msg = {'topic':topic, 'payload':payload, 'qos':qos, 'retain':retain}
-    multiple([msg], hostname, port, client_id, keepalive, will, auth, tls, protocol)
+    multiple([msg], hostname, port, client_id, keepalive, will, auth, tls, protocol, transport)
 

src/paho/mqtt/subscribe.py

+# Copyright (c) 2016 Roger Light <roger@atchoo.org>
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Eclipse Distribution License v1.0 which accompany this distribution.
+#
+# The Eclipse Public License is available at
+#    http://www.eclipse.org/legal/epl-v10.html
+# and the Eclipse Distribution License is available at
+#   http://www.eclipse.org/org/documents/edl-v10.php.
+#
+# Contributors:
+#    Roger Light - initial API and implementation
+
+"""
+This module provides some helper functions to allow straightforward subscribing
+to topics and retrieving messages. The two functions are simple(), which
+returns one or messages matching a set of topics, and callback() which allows
+you to pass a callback for processing of messages.
+"""
+
+import paho.mqtt.client as paho
+import paho.mqtt as mqtt
+import ssl
+
+
+def _on_connect(c, userdata, flags, rc):
+    """Internal callback"""
+    if rc != 0:
+        raise mqtt.MQTTException(paho.connack_string(rc))
+
+    if type(userdata['topics']) is list:
+        for t in userdata['topics']:
+            c.subscribe(t, userdata['qos'])
+    else:
+        c.subscribe(userdata['topics'], userdata['qos'])
+
+
+def _on_message_callback(c, userdata, message):
+    """Internal callback"""
+    userdata['callback'](c, userdata['userdata'], message)
+
+
+def _on_message_simple(c, userdata, message):
+    """Internal callback"""
+
+    if userdata['msg_count'] == 0:
+        return
+
+    # Don't process stale retained messages if 'retained' was false
+    if userdata['retained'] == False and message.retain == True:
+        return
+
+    userdata['msg_count'] = userdata['msg_count'] - 1
+
+    if userdata['messages'] is None and userdata['msg_count'] == 0:
+        userdata['messages'] = message
+        c.disconnect()
+        return
+
+    userdata['messages'].append(message)
+    if userdata['msg_count'] == 0:
+        c.disconnect()
+
+
+def callback(callback, topics, qos=0, userdata=None, hostname="localhost",
+        port=1883, client_id="", keepalive=60, will=None, auth=None, tls=None,
+        protocol=paho.MQTTv311, transport="tcp"):
+    """Subscribe to a list of topics and process them in a callback function.
+
+    This function creates an MQTT client, connects to a broker and subscribes
+    to a list of topics. Incoming messages are processed by the user provided
+    callback.  This is a blocking function and will never return.
+
+    callback : function of the form "on_message(client, userdata, message)" for
+               processing the messages received.
+
+    topics : either a string containing a single topic to subscribe to, or a
+             list of topics to subscribe to.
+
+    qos : the qos to use when subscribing. This is applied to all topics.
+
+    userdata : passed to the callback
+
+    hostname : a string containing the address of the broker to connect to.
+               Defaults to localhost.
+
+    port : the port to connect to the broker on. Defaults to 1883.
+
+    client_id : the MQTT client id to use. If "" or None, the Paho library will
+                generate a client id automatically.
+
+    keepalive : the keepalive timeout value for the client. Defaults to 60
+                seconds.
+
+    will : a dict containing will parameters for the client: will = {'topic':
+           "<topic>", 'payload':"<payload">, 'qos':<qos>, 'retain':<retain>}.
+           Topic is required, all other parameters are optional and will
+           default to None, 0 and False respectively.
+           Defaults to None, which indicates no will should be used.
+
+    auth : a dict containing authentication parameters for the client:
+           auth = {'username':"<username>", 'password':"<password>"}
+           Username is required, password is optional and will default to None
+           if not provided.
+           Defaults to None, which indicates no authentication is to be used.
+
+    tls : a dict containing TLS configuration parameters for the client:
+          dict = {'ca_certs':"<ca_certs>", 'certfile':"<certfile>",
+          'keyfile':"<keyfile>", 'tls_version':"<tls_version>",
+          'ciphers':"<ciphers">}
+          ca_certs is required, all other parameters are optional and will
+          default to None if not provided, which results in the client using
+          the default behaviour - see the paho.mqtt.client documentation.
+          Defaults to None, which indicates that TLS should not be used.
+    transport : set to "tcp" to use the default setting of transport which is
+          raw TCP. Set to "websockets" to use WebSockets as the transport.
+    """
+
+    if qos < 0 or qos > 2:
+        raise ValueError('qos must be in the range 0-2')
+
+    callback_userdata = {
+            'callback':callback,
+            'topics':topics,
+            'qos':qos,
+            'userdata':userdata}
+
+    client = paho.Client(client_id=client_id,
+                         userdata=callback_userdata, protocol=protocol, transport=transport)
+    client.on_message = _on_message_callback
+    client.on_connect = _on_connect
+
+    if auth is not None:
+        username = auth['username']
+        try:
+            password = auth['password']
+        except KeyError:
+            password = None
+        client.username_pw_set(username, password)
+
+    if will is not None:
+        will_topic = will['topic']
+        try:
+            will_payload = will['payload']
+        except KeyError:
+            will_payload = None
+        try:
+            will_qos = will['qos']
+        except KeyError:
+            will_qos = 0
+        try:
+            will_retain = will['retain']
+        except KeyError:
+            will_retain = False
+
+        client.will_set(will_topic, will_payload, will_qos, will_retain)
+
+    if tls is not None:
+        ca_certs = tls['ca_certs']
+        try:
+            certfile = tls['certfile']
+        except KeyError:
+            certfile = None
+        try:
+            keyfile = tls['keyfile']
+        except KeyError:
+            keyfile = None
+        try:
+            tls_version = tls['tls_version']
+        except KeyError:
+            tls_version = ssl.PROTOCOL_SSLv23;
+        try:
+            ciphers = tls['ciphers']
+        except KeyError:
+            ciphers = None
+        client.tls_set(ca_certs, certfile, keyfile, tls_version=tls_version,
+                       ciphers=ciphers)
+
+    client.connect(hostname, port, keepalive)
+    client.loop_forever()
+
+
+def simple(topics, qos=0, msg_count=1, retained=True, hostname="localhost", port=1883,
+        client_id="", keepalive=60, will=None, auth=None, tls=None,
+        protocol=paho.MQTTv311, transport="tcp"):
+    """Subscribe to a list of topics and return msg_count messages.
+
+    This function creates an MQTT client, connects to a broker and subscribes
+    to a list of topics. Once "msg_count" messages have been received, it
+    disconnects cleanly from the broker and returns the messages.
+
+    topics : either a string containing a single topic to subscribe to, or a
+             list of topics to subscribe to.
+
+    qos : the qos to use when subscribing. This is applied to all topics.
+
+    msg_count : the number of messages to retrieve from the broker. 
+                if msg_count == 1 then a single MQTTMessage will be returned.
+                if msg_count > 1 then a list of MQTTMessages will be returned.
+
+    retained : If set to True, retained messages will be processed the same as
+               non-retained messages. If set to False, retained messages will
+               be ignored. This means that with retained=False and msg_count=1,
+               the function will return the first message received that does
+               not have the retained flag set.
+
+    hostname : a string containing the address of the broker to connect to.
+               Defaults to localhost.
+
+    port : the port to connect to the broker on. Defaults to 1883.
+
+    client_id : the MQTT client id to use. If "" or None, the Paho library will
+                generate a client id automatically.
+
+    keepalive : the keepalive timeout value for the client. Defaults to 60
+                seconds.
+
+    will : a dict containing will parameters for the client: will = {'topic':
+           "<topic>", 'payload':"<payload">, 'qos':<qos>, 'retain':<retain>}.
+           Topic is required, all other parameters are optional and will
+           default to None, 0 and False respectively.
+           Defaults to None, which indicates no will should be used.
+
+    auth : a dict containing authentication parameters for the client:
+           auth = {'username':"<username>", 'password':"<password>"}
+           Username is required, password is optional and will default to None
+           if not provided.
+           Defaults to None, which indicates no authentication is to be used.
+
+    tls : a dict containing TLS configuration parameters for the client:
+          dict = {'ca_certs':"<ca_certs>", 'certfile':"<certfile>",
+          'keyfile':"<keyfile>", 'tls_version':"<tls_version>",
+          'ciphers':"<ciphers">}
+          ca_certs is required, all other parameters are optional and will
+          default to None if not provided, which results in the client using
+          the default behaviour - see the paho.mqtt.client documentation.
+          Defaults to None, which indicates that TLS should not be used.
+    transport : set to "tcp" to use the default setting of transport which is
+          raw TCP. Set to "websockets" to use WebSockets as the transport.
+    """
+
+    if msg_count < 1:
+        raise ValueError('msg_count must be > 0')
+
+    # Set ourselves up to return a single message if msg_count == 1, or a list
+    # if > 1.
+    if msg_count == 1:
+        messages = None
+    else:
+        messages = []
+
+    userdata = {'retained':retained, 'msg_count':msg_count, 'messages':messages}
+
+    callback(_on_message_simple, topics, qos, userdata, hostname, port,
+            client_id, keepalive, will, auth, tls, protocol, transport)
+
+    return userdata['messages']
+

test/lib/01-con-discon-success-mqtt311.py

@@ -13,7 +13,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/01-con-discon-success.py

@@ -13,7 +13,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))
@@ -24,7 +23,7 @@ import paho_test
 
 rc = 1
 keepalive = 60
-connect_packet = paho_test.gen_connect("01-con-discon-success", keepalive=keepalive)
+connect_packet = paho_test.gen_connect("01-con-discon-success", keepalive=keepalive, proto_name="MQIsdp", proto_ver=3)
 connack_packet = paho_test.gen_connack(rc=0)
 
 disconnect_packet = paho_test.gen_disconnect()

test/lib/01-no-clean-session.py

@@ -10,7 +10,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/01-unpwd-set.py

@@ -10,7 +10,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/01-will-set.py

@@ -12,7 +12,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/01-will-unpwd-set.py

@@ -12,7 +12,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/02-subscribe-qos0.py

@@ -17,7 +17,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/02-subscribe-qos1.py

@@ -17,7 +17,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/02-subscribe-qos2.py

@@ -17,7 +17,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/02-unsubscribe.py

@@ -7,7 +7,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/03-publish-c2b-qos1-disconnect.py

@@ -7,7 +7,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/03-publish-c2b-qos1-timeout.py

@@ -21,7 +21,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/03-publish-c2b-qos2-disconnect.py

@@ -7,7 +7,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/03-publish-c2b-qos2-timeout.py

@@ -25,7 +25,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/03-publish-qos0-no-payload.py

@@ -15,7 +15,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/03-publish-qos0.py

@@ -15,7 +15,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/04-retain-qos0.py

@@ -7,7 +7,6 @@ import os
 import subprocess
 import socket
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/08-ssl-bad-cacert.py

@@ -3,18 +3,13 @@
 import inspect
 import os
 import subprocess
-import socket
-import ssl
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))
 if cmd_subfolder not in sys.path:
     sys.path.insert(0, cmd_subfolder)
 
-import paho_test
-
 if sys.version < '2.7':
     print("WARNING: SSL not supported on Python 2.6")
     exit(0)

test/lib/08-ssl-connect-cert-auth.py

@@ -16,7 +16,6 @@ import subprocess
 import socket
 import ssl
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/08-ssl-connect-no-auth.py

@@ -15,7 +15,6 @@ import subprocess
 import socket
 import ssl
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/08-ssl-fake-cacert.py

@@ -13,8 +13,6 @@ cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(insp
 if cmd_subfolder not in sys.path:
     sys.path.insert(0, cmd_subfolder)
 
-import paho_test
-
 if sys.version < '2.7':
     print("WARNING: SSL not supported on Python 2.6")
     exit(0)

test/lib/09-util-topic-matching.py

@@ -4,7 +4,6 @@ import inspect
 import os
 import subprocess
 import sys
-import time
 
 # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
 cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))

test/lib/python/01-con-discon-success.test

@@ -22,7 +22,7 @@ def on_disconnect(mqttc, obj, rc):
 
 
 run = -1
-mqttc = mqtt.Client("01-con-discon-success", run)
+mqttc = mqtt.Client("01-con-discon-success", run, protocol=mqtt.MQTTv31)
 mqttc.on_connect = on_connect
 mqttc.on_disconnect = on_disconnect
 

test/lib/python3/01-con-discon-success.test

@@ -22,7 +22,7 @@ def on_disconnect(mqttc, obj, rc):
 
 
 run = -1
-mqttc = mqtt.Client("01-con-discon-success", run)
+mqttc = mqtt.Client("01-con-discon-success", run, protocol=mqtt.MQTTv31)
 mqttc.on_connect = on_connect
 mqttc.on_disconnect = on_disconnect
 

test/paho_test.py

@@ -201,7 +201,7 @@ def to_string(packet):
         # Reserved
         return "0xF0"
 
-def gen_connect(client_id, clean_session=True, keepalive=60, username=None, password=None, will_topic=None, will_qos=0, will_retain=False, will_payload="", proto_name="MQIsdp", proto_ver=3):
+def gen_connect(client_id, clean_session=True, keepalive=60, username=None, password=None, will_topic=None, will_qos=0, will_retain=False, will_payload="", proto_name="MQTT", proto_ver=4):
     if client_id == None:
         remaining_length = 12
     else: