Merge branch 'dev' into 3.0.0

Author: dhoomakethu

README.rst

@@ -20,7 +20,7 @@ PyModbus - A Python Modbus Stack
 Summary
 ------------------------------------------------------------
 
-Pymodbus is a full Modbus protocol implementation using twisted/torndo/asyncio for its
+Pymodbus is a full Modbus protocol implementation using twisted/tornado/asyncio for its
 asynchronous communications core.  It can also be used without any third
 party dependencies (aside from pyserial) if a more lightweight project is
 needed.  Furthermore, it should work fine under any python version > 2.7

pymodbus/client/sync.py

@@ -291,7 +291,11 @@ def _recv(self, size):
         time_ = time.time()
         end = time_ + timeout
         while recv_size > 0:
-            ready = select.select([self.socket], [], [], end - time_)
+            try:
+                ready = select.select([self.socket], [], [], end - time_)
+            except ValueError:
+                return self._handle_abrupt_socket_close(
+                    size, data, time.time() - time_)
             if ready[0]:
                 recv_data = self.socket.recv(recv_size)
                 if recv_data == b'':

pymodbus/other_message.py

@@ -369,7 +369,16 @@ def execute(self, context=None):
             reportSlaveIdData = getattr(context, 'reportSlaveIdData', None)
         if not reportSlaveIdData:
             information = DeviceInformationFactory.get(_MCB)
-            identifier = "-".join(information.values()).encode()
+
+            # Support identity values as bytes data and regular str data
+            id_data = []
+            for v in information.values():
+                if isinstance(v, bytes):
+                    id_data.append(v)
+                else:
+                    id_data.append(v.encode())
+
+            identifier = b"-".join(id_data)
             identifier = identifier or b'Pymodbus'
             reportSlaveIdData = identifier
         return ReportSlaveIdResponse(reportSlaveIdData)

pymodbus/repl/client/mclient.py

@@ -270,7 +270,7 @@ def mask_write_register(self, address=0x0000,
         :param unit: The slave unit this request is targeting
         :return:
         """
-        resp = super(ExtendedRequestSupport, self).read_input_registers(
+        resp = super(ExtendedRequestSupport, self).mask_write_register(
             address=address, and_mask=and_mask, or_mask=or_mask, **kwargs)
         if not resp.isError():
             return {

pymodbus/server/sync.py

@@ -536,7 +536,8 @@ def __init__(self, context, framer=None, identity=None, **kwargs):
         self.socket = None
         if self._connect():
             self.is_running = True
-            self._build_handler()
+            self._build_handler(kwargs.get('handler',
+                                           CustomSingleRequestHandler))
 
     def _connect(self):
         """ Connect to the serial server
@@ -555,19 +556,19 @@ def _connect(self):
             _logger.error(msg)
         return self.socket is not None
 
-    def _build_handler(self):
+    def _build_handler(self, handler):
         """ A helper method to create and monkeypatch
             a serial handler.
+        :param handler: a custom handler, uses ModbusSingleRequestHandler if set to None
 
         :returns: A patched handler
         """
-
         request = self.socket
         request.send = request.write
         request.recv = request.read
-        self.handler = CustomSingleRequestHandler(request,
-                                                  (self.device, self.device),
-                                                  self)
+        self.handler = handler(request,
+                               (self.device, self.device),
+                               self)
 
     def serve_forever(self):
         """ Callback for connecting a new client thread

test/test_other_messages.py

@@ -87,6 +87,45 @@ def testGetCommEventLogWithEvents(self):
         self.assertEqual(response.event_count, 0x12)
         self.assertEqual(response.events, [0x12,0x34,0x56])
 
+    def testReportSlaveIdRequest(self):
+        with mock.patch("pymodbus.other_message.DeviceInformationFactory") as dif:
+            # First test regular identity strings
+            identity = {
+                0x00: 'VN',  # VendorName
+                0x01: 'PC',  # ProductCode
+                0x02: 'REV',  # MajorMinorRevision
+                0x03: 'VU',  # VendorUrl
+                0x04: 'PN',  # ProductName
+                0x05: 'MN',  # ModelName
+                0x06: 'UAN',  # UserApplicationName
+                0x07: 'RA',  # reserved
+                0x08: 'RB',  # reserved
+            }
+            dif.get.return_value = identity
+            expected_identity = "-".join(identity.values()).encode()
+
+            request = ReportSlaveIdRequest()
+            response = request.execute()
+            self.assertEqual(response.identifier, expected_identity)
+
+            # Change to byte strings and test again (final result should be the same)
+            identity = {
+                0x00: b'VN',  # VendorName
+                0x01: b'PC',  # ProductCode
+                0x02: b'REV',  # MajorMinorRevision
+                0x03: b'VU',  # VendorUrl
+                0x04: b'PN',  # ProductName
+                0x05: b'MN',  # ModelName
+                0x06: b'UAN',  # UserApplicationName
+                0x07: b'RA',  # reserved
+                0x08: b'RB',  # reserved
+            }
+            dif.get.return_value = identity
+
+            request = ReportSlaveIdRequest()
+            response = request.execute()
+            self.assertEqual(response.identifier, expected_identity)
+
     def testReportSlaveId(self):
         with mock.patch("pymodbus.other_message.DeviceInformationFactory") as dif:
             dif.get.return_value = dict()