Made support for Python 3.6 interpreter

Author: serhmarch

modbus

@@ -3,8 +3,8 @@
 IDI_ICON1	ICON	DISCARDABLE	"gui\\icons\\client.ico"
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 0,4,4,0
-	PRODUCTVERSION 0,4,4,0
+	FILEVERSION 0,4,5,0
+	PRODUCTVERSION 0,4,5,0
 	FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 	FILEFLAGS VS_FF_DEBUG
@@ -21,11 +21,11 @@ VS_VERSION_INFO VERSIONINFO
 			BEGIN
 				VALUE "CompanyName", "\0"
 				VALUE "FileDescription", "\0"
-				VALUE "FileVersion", "0.4.4.0\0"
+				VALUE "FileVersion", "0.4.5.0\0"
 				VALUE "LegalCopyright", "\0"
 				VALUE "OriginalFilename", "client.exe\0"
 				VALUE "ProductName", "client\0"
-				VALUE "ProductVersion", "0.4.4.0\0"
+				VALUE "ProductVersion", "0.4.5.0\0"
 			END
 		END
 		BLOCK "VarFileInfo"

src/client/win_resource.rc

@@ -1,19 +1,19 @@
-#ifndef MBCORE_CONFIG_H
-#define MBCORE_CONFIG_H
-
-/*
-   Major part of mbtools version
-*/
-#define MBTOOLS_VERSION_MAJOR 0
-
-/*
-   Minor part of mbtools version
-*/
-#define MBTOOLS_VERSION_MINOR 4
-
-/*
-   Patch part of mbtools version
-*/
-#define MBTOOLS_VERSION_PATCH 5
-
-#endif // MBCORE_CONFIG_H
+#ifndef MBCORE_CONFIG_H
+#define MBCORE_CONFIG_H
+
+/*
+   Major part of mbtools version
+*/
+#define MBTOOLS_VERSION_MAJOR 0
+
+/*
+   Minor part of mbtools version
+*/
+#define MBTOOLS_VERSION_MINOR 4
+
+/*
+   Patch part of mbtools version
+*/
+#define MBTOOLS_VERSION_PATCH 5
+
+#endif // MBCORE_CONFIG_H

src/core/sdk/mbcore_config.h

@@ -3,8 +3,8 @@
 
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 0,4,4,0
-	PRODUCTVERSION 0,4,4,0
+	FILEVERSION 0,4,5,0
+	PRODUCTVERSION 0,4,5,0
 	FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 	FILEFLAGS VS_FF_DEBUG
@@ -21,11 +21,11 @@ VS_VERSION_INFO VERSIONINFO
 			BEGIN
 				VALUE "CompanyName", "\0"
 				VALUE "FileDescription", "\0"
-				VALUE "FileVersion", "0.4.4.0\0"
+				VALUE "FileVersion", "0.4.5.0\0"
 				VALUE "LegalCopyright", "\0"
 				VALUE "OriginalFilename", "core.dll\0"
 				VALUE "ProductName", "core\0"
-				VALUE "ProductVersion", "0.4.4.0\0"
+				VALUE "ProductVersion", "0.4.5.0\0"
 			END
 		END
 		BLOCK "VarFileInfo"

src/core/win_resource.rc

@@ -1,24 +1,24 @@
-# -----------------------------------------------------------------------------
-# mbconfig.py
-#
-# DO NOT EDIT THIS FILE! It is autogenerated.
-#
-# This is Python module for ModbusTools server configuration.
-# It is intended to be converted into a usable Python module
-# containing configuration parameters and logic for the Modbus server.
-# -----------------------------------------------------------------------------
-
-# Major part of mbtools version
-MBTOOLS_VERSION_MAJOR = 0
-
-# Minor part of mbtools version
-MBTOOLS_VERSION_MINOR = 4
-
-# Patch part of mbtools version
-MBTOOLS_VERSION_PATCH = 5
-
-# Integer representation of mbtools version
-MBTOOLS_VERSION_INT = (0 << 16) | (4 << 8) | 5
-
-# String representation of mbtools version
-MBTOOLS_VERSION_STR = "0.4.5"
+# -----------------------------------------------------------------------------
+# mbconfig.py
+#
+# DO NOT EDIT THIS FILE! It is autogenerated.
+#
+# This is Python module for ModbusTools server configuration.
+# It is intended to be converted into a usable Python module
+# containing configuration parameters and logic for the Modbus server.
+# -----------------------------------------------------------------------------
+
+# Major part of mbtools version
+MBTOOLS_VERSION_MAJOR = 0
+
+# Minor part of mbtools version
+MBTOOLS_VERSION_MINOR = 4
+
+# Patch part of mbtools version
+MBTOOLS_VERSION_PATCH = 5
+
+# Integer representation of mbtools version
+MBTOOLS_VERSION_INT = (0 << 16) | (4 << 8) | 5
+
+# String representation of mbtools version
+MBTOOLS_VERSION_STR = "0.4.5"

src/server/python/mbconfig.py

@@ -10,6 +10,7 @@
 from ctypes import *
 import struct
 
+from typing import Union
 from PyQt5.QtCore import QSharedMemory
 
 from mbconfig import *
@@ -127,7 +128,7 @@ def _recalcheader(self, byteoffset:int, bytecount:int):
             self._head.changeByteCount = rightedge - self._head.changeByteOffset
         self._head.changeCounter += 1
 
-    def _getbytes(self, byteoffset:int, count:int, bytestype=bytes)->bytes:
+    def _getbytes(self, byteoffset: int, count: int, bytestype=bytes) -> Union[bytes, bytearray]:
         if 0 <= byteoffset < self._countbytes:
             if byteoffset+count > self._countbytes:
                 c = self._countbytes - byteoffset
@@ -233,7 +234,7 @@ def getbytearray(self, byteoffset:int, bytecount:int)->bytearray:
         """
         return self._getbytes(byteoffset, bytecount, bytearray)
 
-    def setbytes(self, byteoffset:int, value:type[bytes|bytearray]):
+    def setbytes(self, byteoffset: int, value: Union[bytes, bytearray]):
         """
         @details 
         Function set `value` (`bytes` or `bytearray`) array object into device memory
@@ -311,7 +312,7 @@ def getbitbytes(self, bitoffset:int, bitcount:int)->bytes:
         """
         return bytes(self.getbitbytearray(bitoffset, bitcount))
 
-    def setbitbytes(self, bitoffset:int, bitcount:int, value:type[bytes|bytearray]):
+    def setbitbytes(self, bitoffset: int, bitcount: int, value: Union[bytes, bytearray]):
         """
         @details
         Function set `value` (`bytes` or `bytearray`) array object into device memory

src/server/python/mbserver.py

@@ -3,8 +3,8 @@
 IDI_ICON1	ICON	DISCARDABLE	"gui\\icons\\server.ico"
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 0,4,4,0
-	PRODUCTVERSION 0,4,4,0
+	FILEVERSION 0,4,5,0
+	PRODUCTVERSION 0,4,5,0
 	FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 	FILEFLAGS VS_FF_DEBUG
@@ -21,11 +21,11 @@ VS_VERSION_INFO VERSIONINFO
 			BEGIN
 				VALUE "CompanyName", "\0"
 				VALUE "FileDescription", "\0"
-				VALUE "FileVersion", "0.4.4.0\0"
+				VALUE "FileVersion", "0.4.5.0\0"
 				VALUE "LegalCopyright", "\0"
 				VALUE "OriginalFilename", "server.exe\0"
 				VALUE "ProductName", "server\0"
-				VALUE "ProductVersion", "0.4.4.0\0"
+				VALUE "ProductVersion", "0.4.5.0\0"
 			END
 		END
 		BLOCK "VarFileInfo"