Merge branch 'master' of https://github.com/JamesParrott/paho.mqtt.python

Author: JamesParrott

README.rst

@@ -137,7 +137,7 @@ Here is a very simple example that subscribes to the broker $SYS topic tree and
     mqttc.on_connect = on_connect
     mqttc.on_message = on_message
 
-    mqttc.connect("mqtt.eclipseprojects.io", 1883, 60)
+    mqttc.connect("test.mosquitto.org", 1883, 60)
 
     # Blocking call that processes network traffic, dispatches callbacks and
     # handles reconnecting.
@@ -311,7 +311,7 @@ Subscriber example
     mqttc.on_unsubscribe = on_unsubscribe
     
     mqttc.user_data_set([])
-    mqttc.connect("mqtt.eclipseprojects.io")
+    mqttc.connect("test.mosquitto.org")
     mqttc.loop_forever()
     print(f"Received the following message: {mqttc.user_data_get()}")
 
@@ -345,7 +345,7 @@ publisher example
     mqttc.on_publish = on_publish
     
     mqttc.user_data_set(unacked_publish)
-    mqttc.connect("mqtt.eclipseprojects.io")
+    mqttc.connect("test.mosquitto.org")
     mqttc.loop_start()
 
     # Our application produce some messages
@@ -386,7 +386,7 @@ Example:
     mqttc = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2)
     mqttc.enable_logger()
 
-    mqttc.connect("mqtt.eclipseprojects.io", 1883, 60)
+    mqttc.connect("test.mosquitto.org", 1883, 60)
     mqttc.loop_start()
 
     # Do additional action needed, publish, subscribe, ...
@@ -405,7 +405,7 @@ It's also possible to define a on_log callback that will receive a copy of all l
     mqttc = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2)
     mqttc.on_log = on_log
 
-    mqttc.connect("mqtt.eclipseprojects.io", 1883, 60)
+    mqttc.connect("test.mosquitto.org", 1883, 60)
     mqttc.loop_start()
 
     # Do additional action needed, publish, subscribe, ...
@@ -521,7 +521,7 @@ Example:
 
     import paho.mqtt.publish as publish
 
-    publish.single("paho/test/topic", "payload", hostname="mqtt.eclipseprojects.io")
+    publish.single("paho/test/topic", "payload", hostname="test.mosquitto.org")
 
 Multiple
 ````````
@@ -537,7 +537,7 @@ Example:
 
     msgs = [{'topic':"paho/test/topic", 'payload':"multiple 1"},
         ("paho/test/topic", "multiple 2", 0, False)]
-    publish.multiple(msgs, hostname="mqtt.eclipseprojects.io", protocol=MQTTProtocolVersion.MQTTv5)
+    publish.multiple(msgs, hostname="test.mosquitto.org", protocol=MQTTProtocolVersion.MQTTv5)
 
 
 Subscribe
@@ -563,7 +563,7 @@ Example:
 
     import paho.mqtt.subscribe as subscribe
 
-    msg = subscribe.simple("paho/test/topic", hostname="mqtt.eclipseprojects.io")
+    msg = subscribe.simple("paho/test/topic", hostname="test.mosquitto.org")
     print("%s %s" % (msg.topic, msg.payload))
 
 Using Callback
@@ -585,7 +585,7 @@ Example:
             # it's possible to stop the program by disconnecting
             client.disconnect()
 
-    subscribe.callback(on_message_print, "paho/test/topic", hostname="mqtt.eclipseprojects.io", userdata={"message_count": 0})
+    subscribe.callback(on_message_print, "paho/test/topic", hostname="test.mosquitto.org", userdata={"message_count": 0})
 
 
 Reporting bugs

src/paho/mqtt/client.py

@@ -1153,7 +1153,7 @@ def reinitialise(
     ) -> None:
         self._reset_sockets()
 
-        self.__init__(client_id, clean_session, userdata)  # type: ignore[misc]
+        self.__init__(self.callback_api_version, client_id, clean_session, userdata)  # type: ignore[misc]
 
     def ws_set_options(
         self,
@@ -2458,7 +2458,7 @@ def on_connect(self) -> CallbackOnConnect | None:
         :param Client client: the client instance for this callback
         :param userdata: the private user data as set in Client() or user_data_set()
         :param ConnectFlags connect_flags: the flags for this connection
-        :param ReasonCode reason_code: the connection reason code received from the broken.
+        :param ReasonCode reason_code: the connection reason code received from the broker.
                        In MQTT v5.0 it's the reason code defined by the standard.
                        In MQTT v3, we convert return code to a reason code, see
                        `convert_connack_rc_to_reason_code()`.
@@ -2642,7 +2642,7 @@ def on_publish(self) -> CallbackOnPublish | None:
         :param userdata: the private user data as set in Client() or user_data_set()
         :param int mid: matches the mid variable returned from the corresponding
                      `publish()` call, to allow outgoing messages to be tracked.
-        :param ReasonCode reason_code: the connection reason code received from the broken.
+        :param ReasonCode reason_code: the connection reason code received from the broker.
                      In MQTT v5.0 it's the reason code defined by the standard.
                      In MQTT v3 it's always the reason code Success
         :parama Properties properties: the MQTT v5.0 properties received from the broker.