Merge branch 'dev' into fix-533

Author: dhoomakethu

examples/common/synchronous_client.py

@@ -14,7 +14,7 @@
         print result
 """
 # --------------------------------------------------------------------------- #
-# import the various server implementations
+# import the various client implementations
 # --------------------------------------------------------------------------- #
 from pymodbus.client.sync import ModbusTcpClient as ModbusClient
 # from pymodbus.client.sync import ModbusUdpClient as ModbusClient
@@ -104,12 +104,13 @@ def run_sync_client():
     rq = client.write_coil(0, True, unit=UNIT)
     rr = client.read_coils(0, 1, unit=UNIT)
     assert(not rq.isError())     # test that we are not an error
+    assert(not rr.isError())     # test that we are not an error
     assert(rr.bits[0] == True)          # test the expected value
 
     log.debug("Write to multiple coils and read back- test 1")
     rq = client.write_coils(1, [True]*8, unit=UNIT)
-    assert(not rq.isError())     # test that we are not an error
     rr = client.read_coils(1, 21, unit=UNIT)
+    assert(not rq.isError())     # test that we are not an error
     assert(not rr.isError())     # test that we are not an error
     resp = [True]*21
 
@@ -124,27 +125,30 @@ def run_sync_client():
     rq = client.write_coils(1, [False]*8, unit=UNIT)
     rr = client.read_coils(1, 8, unit=UNIT)
     assert(not rq.isError())     # test that we are not an error
+    assert(not rr.isError())     # test that we are not an error
     assert(rr.bits == [False]*8)         # test the expected value
 
     log.debug("Read discrete inputs")
     rr = client.read_discrete_inputs(0, 8, unit=UNIT)
-    assert(not rq.isError())     # test that we are not an error
+    assert(not rr.isError())     # test that we are not an error
 
     log.debug("Write to a holding register and read back")
     rq = client.write_register(1, 10, unit=UNIT)
     rr = client.read_holding_registers(1, 1, unit=UNIT)
     assert(not rq.isError())     # test that we are not an error
+    assert(not rr.isError())     # test that we are not an error
     assert(rr.registers[0] == 10)       # test the expected value
 
     log.debug("Write to multiple holding registers and read back")
     rq = client.write_registers(1, [10]*8, unit=UNIT)
     rr = client.read_holding_registers(1, 8, unit=UNIT)
     assert(not rq.isError())     # test that we are not an error
+    assert(not rr.isError())     # test that we are not an error
     assert(rr.registers == [10]*8)      # test the expected value
 
     log.debug("Read input registers")
     rr = client.read_input_registers(1, 8, unit=UNIT)
-    assert(not rq.isError())     # test that we are not an error
+    assert(not rr.isError())     # test that we are not an error
 
     arguments = {
         'read_address':    1,
@@ -156,6 +160,7 @@ def run_sync_client():
     rq = client.readwrite_registers(unit=UNIT, **arguments)
     rr = client.read_holding_registers(1, 8, unit=UNIT)
     assert(not rq.isError())     # test that we are not an error
+    assert(not rr.isError())     # test that we are not an error
     assert(rq.registers == [20]*8)      # test the expected value
     assert(rr.registers == [20]*8)      # test the expected value
 

pymodbus/client/asynchronous/async_io/__init__.py

@@ -7,7 +7,7 @@
 import ssl
 from pymodbus.exceptions import ConnectionException
 from pymodbus.client.asynchronous.mixins import AsyncModbusClientMixin
-from pymodbus.compat import byte2int
+from pymodbus.utilities import hexlify_packets
 from pymodbus.transaction import FifoTransactionManager
 import logging
 
@@ -137,7 +137,7 @@ def _execute(self, request, **kwargs):
         """
         request.transaction_id = self.transaction.getNextTID()
         packet = self.framer.buildPacket(request)
-        _logger.debug("send: " + " ".join([hex(byte2int(x)) for x in packet]))
+        _logger.debug("send: " + hexlify_packets(packet))
         self.write_transport(packet)
         return self._buildResponse(request.transaction_id)
 
@@ -146,7 +146,7 @@ def _dataReceived(self, data):
 
         :param data: The data returned from the server
         '''
-        _logger.debug("recv: " + " ".join([hex(byte2int(x)) for x in data]))
+        _logger.debug("recv: " + hexlify_packets(data))
         unit = self.framer.decode_data(data).get("unit", 0)
         self.framer.processIncomingPacket(data, self._handleResponse, unit=unit)
 

pymodbus/client/asynchronous/tornado/__init__.py

@@ -18,6 +18,7 @@
 
 from pymodbus.client.asynchronous.mixins import (AsyncModbusClientMixin,
                                                  AsyncModbusSerialClientMixin)
+
 from pymodbus.compat import byte2int
 from pymodbus.exceptions import (ConnectionException,
                                  ModbusIOException,
@@ -26,6 +27,7 @@
                                 ModbusTransactionState)
 from pymodbus.constants import Defaults
 
+
 LOGGER = logging.getLogger(__name__)
 
 
@@ -80,7 +82,7 @@ def on_receive(self, *args):
 
         if not data:
             return
-        LOGGER.debug("recv: " + " ".join([hex(byte2int(x)) for x in data]))
+        LOGGER.debug("recv: " + hexlify_packets(data))
         unit = self.framer.decode_data(data).get("unit", 0)
         self.framer.processIncomingPacket(data, self._handle_response, unit=unit)
 
@@ -92,7 +94,7 @@ def execute(self, request=None):
         """
         request.transaction_id = self.transaction.getNextTID()
         packet = self.framer.buildPacket(request)
-        LOGGER.debug("send: " + " ".join([hex(byte2int(x)) for x in packet]))
+        LOGGER.debug("send: " + hexlify_packets(packet))
         self.stream.write(packet)
         return self._build_response(request.transaction_id)
 
@@ -180,7 +182,7 @@ def callback(*args):
                 if waiting:
                     data = self.stream.connection.read(waiting)
                     LOGGER.debug(
-                        "recv: " + " ".join([hex(byte2int(x)) for x in data]))
+                        "recv: " + hexlify_packets(data))
                     unit = self.framer.decode_data(data).get("uid", 0)
                     self.framer.processIncomingPacket(
                         data,
@@ -191,7 +193,7 @@ def callback(*args):
                     break
 
         packet = self.framer.buildPacket(request)
-        LOGGER.debug("send: " + " ".join([hex(byte2int(x)) for x in packet]))
+        LOGGER.debug("send: " + hexlify_packets(packet))
         self.stream.write(packet, callback=callback)
         f = self._build_response(request.transaction_id)
         return f

pymodbus/client/asynchronous/twisted/__init__.py

@@ -40,7 +40,7 @@ def process():
 from pymodbus.client.asynchronous.mixins import AsyncModbusClientMixin
 from pymodbus.transaction import FifoTransactionManager, DictTransactionManager
 from pymodbus.transaction import ModbusSocketFramer, ModbusRtuFramer
-from pymodbus.compat import byte2int
+from pymodbus.utilities import hexlify_packets
 from twisted.python.failure import Failure
 
 
@@ -109,7 +109,7 @@ def execute(self, request):
         """
         request.transaction_id = self.transaction.getNextTID()
         packet = self.framer.buildPacket(request)
-        _logger.debug("send: " + " ".join([hex(byte2int(x)) for x in packet]))
+        _logger.debug("send: " + hexlify_packets(packet))
         self.transport.write(packet)
         return self._buildResponse(request.transaction_id)
 

setup.py

@@ -68,7 +68,6 @@
     license='BSD-3-Clause',
     packages=find_packages(exclude=['examples', 'test']),
     exclude_package_data={'': ['examples', 'test', 'tools', 'doc']},
-    py_modules=['ez_setup'],
     platforms=['Linux', 'Mac OS X', 'Win'],
     include_package_data=True,
     zip_safe=True,