Merge branch '1.6.x'

Juha-Ylikoski-Treon · Oct 21, 2021 · 9782ab8 · 9782ab8
2 parents 6dfdeba + 1f3cd09
commit 9782ab8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,9 @@
+v1.6.1 - 2021-10-21
+===================
+
+- Fix Python 2.7 compatilibity.
+
+
 v1.6.0 - 2021-10-20
 ===================
 

diff --git a/src/paho/mqtt/__init__.py b/src/paho/mqtt/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "1.6.0"
+__version__ = "1.6.1"
 
 
 class MQTTException(Exception):

diff --git a/src/paho/mqtt/client.py b/src/paho/mqtt/client.py
@@ -81,6 +81,12 @@
 else:
     EAGAIN = errno.EAGAIN
 
+# Python 2.7 does not have BlockingIOError.  Fall back to IOError
+try:
+    BlockingIOError
+except NameError:
+    BlockingIOError  = IOError
+
 MQTTv31 = 3
 MQTTv311 = 4
 MQTTv5 = 5