Handle pymodbus 3.0 breaking changes.

Author: tjhowse

modbus4mqtt/modbus_interface.py

@@ -2,8 +2,13 @@
 from enum import Enum
 import logging
 from queue import Queue
-from pymodbus.client.sync import ModbusTcpClient, ModbusSocketFramer
-from pymodbus import exceptions
+try:
+    # Pymodbus >= 3.0
+    from pymodbus.client import ModbusTcpClient
+    from pymodbus.transaction import ModbusSocketFramer
+except ImportError:
+    # Pymodbus < 3.0
+    from pymodbus.client.sync import ModbusTcpClient, ModbusSocketFramer
 from SungrowModbusTcpClient import SungrowModbusTcpClient
 
 DEFAULT_SCAN_RATE_S = 5

modbus4mqtt/version.py

@@ -1 +1 @@
-version = "0.6.0"
+version = "0.6.1"

setup.py

@@ -19,7 +19,7 @@
         'paho-mqtt>=1.5.0',
         'pymodbus>=2.3.0',
         'click>=6.7',
-        'SungrowModbusTcpClient>=0.1.6',
+        'SungrowModbusTcpClient>=0.1.7',
     ],
     tests_require=[
         'nose2>=0.9.2',