From: Roger A. Light <roger@atchoo.org>
Date: Fri, 1 Aug 2014 09:23:42 +0000 (+0100)
Subject: Must treat 3.x and 2.7 separately.
X-Git-Tag: v1.1~10
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=300fcbdffd62d08f627f94f3074463cfa532ca87;p=packages%2Fp%2Fpaho-mqtt.git

Must treat 3.x and 2.7 separately.

Change-Id: Idcea1dcd2b22b757d467b0ad5478b48a515afc73
---

diff --git a/src/paho/mqtt/client.py b/src/paho/mqtt/client.py
index 2ef4129..a28c81f 100755
--- a/src/paho/mqtt/client.py
+++ b/src/paho/mqtt/client.py
@@ -840,7 +840,9 @@ class Client(object):
             raise ValueError('Invalid topic.')
         if qos<0 or qos>2:
             raise ValueError('Invalid QoS level.')
-        if isinstance(payload, str) or isinstance(payload, bytearray) or isinstance(payload, unicode):
+        if isinstance(payload, str) or isinstance(payload, bytearray):
+            local_payload = payload
+        elif sys.version_info[0] < 3 and isinstance(payload, unicode):
             local_payload = payload
         elif isinstance(payload, int) or isinstance(payload, float):
             local_payload = str(payload)