Fix examples, Merge #431

Author: dhoomakethu

examples/common/asyncio_server.py

@@ -113,25 +113,25 @@ async def run_server():
     # ----------------------------------------------------------------------- #
     # Tcp:
     # immediately start serving:
-    # server = await StartTcpServer(context, identity=identity, address=("0.0.0.0", 5020),
-    #                               allow_reuse_address=True)
+    await StartTcpServer(context, identity=identity, address=("0.0.0.0", 5020), allow_reuse_address=True,
+                         defer_start=False)
 
     # 	deferred start:
     # server = await StartTcpServer(context, identity=identity, address=("0.0.0.0", 5020),
-    # 							  allow_reuse_address=True, defer_start=True)
-
-    # asyncio.get_event_loop().call_later(20, lambda : server.)
+    #                               allow_reuse_address=True, defer_start=True)
+    #
+    # asyncio.get_event_loop().call_later(20, lambda : server.serve_forever)
     # await server.serve_forever()
 
     # TCP with different framer
     # StartTcpServer(context, identity=identity,
     #                framer=ModbusRtuFramer, address=("0.0.0.0", 5020))
 
     # Udp:
-    server = await StartUdpServer(context, identity=identity, address=("0.0.0.0", 5020),
-                                  allow_reuse_address=True, defer_start=True)
-    #
-    await server.serve_forever()
+    # server = await StartUdpServer(context, identity=identity, address=("0.0.0.0", 5020),
+    #                               allow_reuse_address=True, defer_start=True)
+    # #
+    # await server.serve_forever()
 
     # !!! SERIAL SERVER NOT IMPLEMENTED !!!
     # Ascii:

examples/common/synchronous_client.py

@@ -16,9 +16,9 @@
 # --------------------------------------------------------------------------- #
 # import the various server implementations
 # --------------------------------------------------------------------------- #
-# from pymodbus.client.sync import ModbusTcpClient as ModbusClient
+from pymodbus.client.sync import ModbusTcpClient as ModbusClient
 # from pymodbus.client.sync import ModbusUdpClient as ModbusClient
-from pymodbus.client.sync import ModbusSerialClient as ModbusClient
+# from pymodbus.client.sync import ModbusSerialClient as ModbusClient
 
 # --------------------------------------------------------------------------- #
 # configure the client logging

pymodbus/client/sync.py

@@ -262,26 +262,29 @@ def _recv(self, size):
         else:
             recv_size = size
 
-        data = b''
+        data = []
+        data_length = 0
         time_ = time.time()
         end = time_ + timeout
         while recv_size > 0:
             ready = select.select([self.socket], [], [], end - time_)
             if ready[0]:
-                data += self.socket.recv(recv_size)
+                recv_data = self.socket.recv(recv_size)
+                data.append(recv_data)
+                data_length += len(recv_data)
             time_ = time.time()
 
             # If size isn't specified continue to read until timeout expires.
             if size:
-                recv_size = size - len(data)
+                recv_size = size - data_length
 
             # Timeout is reduced also if some data has been received in order
             # to avoid infinite loops when there isn't an expected response
             # size and the slave sends noisy data continuosly.
             if time_ > end:
                 break
 
-        return data
+        return b"".join(data)
 
     def is_socket_open(self):
         return True if self.socket is not None else False

pymodbus/server/asyncio.py

@@ -535,11 +535,12 @@ def __init__(self, context, framer=None, identity=None, **kwargs): # pragma: no
         """
         raise NotImplementedException
 
+
 # --------------------------------------------------------------------------- #
 # Creation Factories
 # --------------------------------------------------------------------------- #
 async def StartTcpServer(context=None, identity=None, address=None,
-                   custom_functions=[], defer_start=True, **kwargs):
+                         custom_functions=[], defer_start=True, **kwargs):
     """ A factory to start and run a tcp modbus server
 
     :param context: The ModbusServerContext datastore