Fix smaller errors

fbeitler · fbeitler · commit 7dfac6f19c60 · 2022-02-02T07:42:48.000+01:00
Remove Python2 from checks, CI stuff and more
diff --git a/.github/pythonpackage.yml b/.github/pythonpackage.yml
@@ -15,12 +15,12 @@ jobs:
         python-version: '3.x'
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
+        python3 -m pip install --upgrade pip
         pip install setuptools wheel twine
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        python setup.py sdist bdist_wheel
+        python3 setup.py sdist bdist_wheel
         twine upload dist/*
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,8 +34,6 @@ jobs:
             runs-on: ubuntu-latest
             matrix: linux
             container:
-              2.7: docker://python:2.7-buster
-              3.6: docker://python:3.6-buster
               3.7: docker://python:3.7-buster
               3.8: docker://python:3.8-buster
               3.9: docker://python:3.9-buster
@@ -51,25 +49,6 @@ jobs:
               x86: win32
               x64: win64
         python:
-          - name: CPython 2.7
-            tox: py27
-            action: 2.7
-            docker: 2.7
-            matrix: 2.7
-            implementation: cpython
-          - name: PyPy 2.7
-            tox: pypy27
-            action: pypy-2.7
-            docker: pypy2.7
-            matrix: 2.7
-            implementation: pypy
-            openssl_msvc_version: 2019
-          - name: CPython 3.6
-            tox: py36
-            action: 3.6
-            docker: 3.6
-            matrix: 3.6
-            implementation: cpython
           - name: CPython 3.7
             tox: py37
             action: 3.7
@@ -88,13 +67,6 @@ jobs:
             docker: 3.9
             matrix: 3.9
             implementation: cpython
-          - name: PyPy 3.6
-            tox: pypy36
-            action: pypy-3.6
-            docker: pypy3.6
-            matrix: 3.6
-            implementation: pypy
-            openssl_msvc_version: 2019
           - name: PyPy 3.7
             tox: pypy37
             action: pypy-3.7
diff --git a/Makefile b/Makefile
@@ -41,22 +41,12 @@ check: install
 
 test: install
 	@pip install --upgrade --quiet --requirement=requirements-tests.txt
-ifeq ($(PYVER),3.6)
-	$(info Running tests on $(PYVER))
-	@pip install --upgrade pip --quiet
-	@pytest --cov=pymodbus/ --cov-report term-missing  test/test_server_asyncio.py test
-	@coverage report --fail-under=85 -i
-else ifeq ($(PYVER),2.7)
-	$(info Running tests on $(PYVER))
-	@pip install pip==20.3.4 --quiet
-	@pytest --cov-config=.coveragerc --cov=pymodbus/ --cov-report term-missing --ignore test/test_server_asyncio.py --ignore test/test_client_async_asyncio.py test
-	@coverage report --fail-under=90 -i
-else
-	$(info Running tests on $(PYVER))
-	@pip install --upgrade pip --quiet
-	@pytest --cov=pymodbus/ --cov-report term-missing  test
-	@coverage report --fail-under=85 -i
-endif
+
+    $(info Running tests on $(PYVER))
+    @pip install --upgrade pip --quiet
+    @pytest --cov=pymodbus/ --cov-report term-missing  test
+    @coverage report --fail-under=85 -i
+
 
 tox: install
 	@pip install --upgrade --quiet tox && tox
diff --git a/README.rst b/README.rst
@@ -23,7 +23,7 @@ Summary
 Pymodbus is a full Modbus protocol implementation using twisted/torndo/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
+needed.  Furthermore, it should work fine under any python version >= 3.7
 (including python 3+)
 
 
diff --git a/doc/INSTALL b/doc/INSTALL
@@ -1,7 +1,7 @@
 Requirements
 -------------
 
-* Python 2.7 or later.
+* Python 3.7 or later.
 * Python Twisted, Tornado or asyncio (For async client and server)
 * Pyserial
 
diff --git a/examples/common/custom_message.py b/examples/common/custom_message.py
@@ -6,9 +6,6 @@
 The following is an example of how to use the synchronous modbus client
 implementation from pymodbus.
 
-It should be noted that the client can also be used with
-the guard construct that is available in python 2.5 and up::
-
     with ModbusClient('127.0.0.1') as client:
         result = client.read_coils(1,10)
         print result
diff --git a/examples/common/custom_message_async_clients.py b/examples/common/custom_message_async_clients.py
@@ -6,9 +6,6 @@
 The following is an example of how to use the synchronous modbus client
 implementation from pymodbus.
 
-It should be noted that the client can also be used with
-the guard construct that is available in python 2.5 and up::
-
     with ModbusClient('127.0.0.1') as client:
         result = client.read_coils(1,10)
         print result
diff --git a/examples/common/synchronous_client.py b/examples/common/synchronous_client.py
@@ -6,9 +6,6 @@
 The following is an example of how to use the synchronous modbus client
 implementation from pymodbus.
 
-It should be noted that the client can also be used with
-the guard construct that is available in python 2.5 and up::
-
     with ModbusClient('127.0.0.1') as client:
         result = client.read_coils(1,10)
         print result
diff --git a/examples/twisted/modbus_tcp.tac b/examples/twisted/modbus_tcp.tac
@@ -10,7 +10,6 @@ from twisted.python.logfile import DailyLogFile
 from pymodbus.constants import Defaults
 from pymodbus.server.async import ModbusServerFactory
 from pymodbus.transaction import ModbusSocketFramer
-from pymodbus.internal.ptwisted import InstallManagementConsole
 
 def BuildService():
     """
@@ -19,7 +18,6 @@ def BuildService():
     context = None
     framer = ModbusSocketFramer
     factory = ModbusServerFactory(context, framer)
-    InstallManagementConsole({ 'server' : factory })
     application = internet.TCPServer(Defaults.Port, factory)
     return application
 
diff --git a/examples/twisted/modbus_udp.tac b/examples/twisted/modbus_udp.tac
@@ -10,7 +10,6 @@ from twisted.python.logfile import DailyLogFile
 from pymodbus.constants import Defaults
 from pymodbus.server.async import ModbusUdpProtocol
 from pymodbus.transaction import ModbusSocketFramer
-from pymodbus.internal.ptwisted import InstallManagementConsole
 
 def BuildService():
     """
@@ -19,7 +18,6 @@ def BuildService():
     context = None
     framer = ModbusSocketFramer
     server = ModbusUdpProtocol(context, framer)
-    InstallManagementConsole({ 'server' : server })
     application = internet.UDPServer(Defaults.Port, server)
     return application
 
diff --git a/examples/twisted/plugins/pymodbus_plugin.py b/examples/twisted/plugins/pymodbus_plugin.py
@@ -10,7 +10,6 @@
 from pymodbus.constants import Defaults
 from pymodbus.server.asynchronous import ModbusServerFactory
 from pymodbus.transaction import ModbusSocketFramer
-from pymodbus.internal.ptwisted import InstallManagementConsole
 
 class Options(usage.Options):
     """
@@ -45,8 +44,6 @@ def makeService(self, options):
         framer = ModbusSocketFramer
         context = self._build_context(options['store'])
         factory = ModbusServerFactory(None, framer)
-        if options['console']:
-            InstallManagementConsole({ 'server' : factory })
         return server(int(options["port"]), factory)
 
     def _build_context(self, path):
diff --git a/pymodbus/compat.py b/pymodbus/compat.py
@@ -1,5 +1,5 @@
 """
-Python 2.x/3.x Compatibility Layer
+Python 3.x Compatibility Layer
 -------------------------------------------------
 
 This is mostly based on the jinja2 compat code:
@@ -57,13 +57,8 @@
 implements_to_string = lambda x: x
 
 byte2int = lambda b: b
-if PYTHON_VERSION >= (3, 4):
-    def is_installed(module):
-        import importlib.util
-        found = importlib.util.find_spec(module)
-        return found
-else:
-    def is_installed(module):
-        import importlib
-        found = importlib.find_loader(module)
-        return found
+
+def is_installed(module):
+    import importlib.util
+    found = importlib.util.find_spec(module)
+    return found
diff --git a/pymodbus/device.py b/pymodbus/device.py
@@ -528,10 +528,10 @@ def clearEvents(self):
     #-------------------------------------------------------------------------#
     # Other Properties
     #-------------------------------------------------------------------------#
-    Identity = property(lambda (s): s.__identity)
-    Counter  = property(lambda (s): s.__counters)
-    Events   = property(lambda (s): s.__events)
-    Plus     = property(lambda (s): s.__plus)
+    Identity = property(lambda s: s.__identity)
+    Counter  = property(lambda s: s.__counters)
+    Events   = property(lambda s: s.__events)
+    Plus     = property(lambda s: s.__plus)
 
     def reset(self):
         ''' This clears all of the system counters and the
@@ -551,7 +551,7 @@ def _setListenOnly(self, value):
         '''
         self.__listen_only = bool(value)
 
-    ListenOnly = property(lambda (s): s.__listen_only, _setListenOnly)
+    ListenOnly = property(lambda s: s.__listen_only, _setListenOnly)
 
     #-------------------------------------------------------------------------#
     # Mode Properties
@@ -564,7 +564,7 @@ def _setMode(self, mode):
         if mode in ['ASCII', 'RTU']:
             self.__mode = mode
 
-    Mode = property(lambda (s): s.__mode, _setMode)
+    Mode = property(lambda s: s.__mode, _setMode)
 
     #-------------------------------------------------------------------------#
     # Delimiter Properties
@@ -581,7 +581,7 @@ def _setDelimiter(self, char):
         elif isinstance(char, int):
             self.__delimiter = int2byte(char)
 
-    Delimiter = property(lambda (s): s.__delimiter, _setDelimiter)
+    Delimiter = property(lambda s: s.__delimiter, _setDelimiter)
 
     #-------------------------------------------------------------------------#
     # Diagnostic Properties
@@ -602,7 +602,7 @@ def getDiagnostic(self, bit):
         :returns: The current value of the requested bit
         '''
         try:
-            if bit and bit >= 0 and bit < len(self.__diagnostic):
+            if bit and 0 <= bit < len(self.__diagnostic):
                 return self.__diagnostic[bit]
         except Exception:
             return None
diff --git a/pymodbus/repl/server/main.py b/pymodbus/repl/server/main.py
@@ -5,14 +5,14 @@
 import asyncio
 import json
 import click
-from pymodbus.compat import IS_PYTHON3, PYTHON_VERSION
+from pymodbus.compat import PYTHON_VERSION
 from pymodbus.framer.socket_framer import ModbusSocketFramer
 from pymodbus.server.reactive.main import (
     ReactiveServer, DEFAULT_FRAMER, DEFUALT_HANDLERS)
 from pymodbus.server.reactive.default_config import DEFUALT_CONFIG
 from pymodbus.repl.server.cli import run_repl
 
-if IS_PYTHON3 and PYTHON_VERSION > (3, 7):
+if PYTHON_VERSION > (3, 7):
     CANCELLED_ERROR = asyncio.exceptions.CancelledError
 else:
     CANCELLED_ERROR = asyncio.CancelledError
diff --git a/pymodbus/server/async_io.py b/pymodbus/server/async_io.py
@@ -87,10 +87,7 @@ def connection_made(self, transport):
             self.framer = self.server.framer(self.server.decoder, client=None)
 
             # schedule the connection handler on the event loop
-            if PYTHON_VERSION >= (3, 7):
-                self.handler_task = asyncio.create_task(self.handle())
-            else:
-                self.handler_task = asyncio.ensure_future(self.handle())
+            self.handler_task = asyncio.create_task(self.handle())
         except Exception as ex: # pragma: no cover
             _logger.error("Datastore unable to fulfill request: "
                           "%s; %s", ex, traceback.format_exc())
@@ -471,23 +468,14 @@ def __init__(self,
         # constructors cannot be declared async, so we have to
         # defer the initialization of the server
         self.server = None
-        if PYTHON_VERSION >= (3, 7):
-            # start_serving is new in version 3.7
-            self.server_factory = self.loop.create_server(
-                lambda: self.handler(self),
-                *self.address,
-                reuse_address=allow_reuse_address,
-                reuse_port=allow_reuse_port,
-                backlog=backlog,
-                start_serving=not defer_start
-            )
-        else:
-            self.server_factory = self.loop.create_server(
-                lambda: self.handler(self),
-                *self.address,
-                reuse_address=allow_reuse_address,
-                reuse_port=allow_reuse_port,
-                backlog=backlog
+        # start_serving is new in version 3.7
+        self.server_factory = self.loop.create_server(
+            lambda: self.handler(self),
+            *self.address,
+            reuse_address=allow_reuse_address,
+            reuse_port=allow_reuse_port,
+            backlog=backlog,
+            start_serving=not defer_start
             )
 
     async def serve_forever(self):
@@ -599,27 +587,16 @@ def __init__(self,
         # constructors cannot be declared async, so we have to
         # defer the initialization of the server
         self.server = None
-        if PYTHON_VERSION >= (3, 7):
-            # start_serving is new in version 3.7
-            self.server_factory = self.loop.create_server(
-                lambda: self.handler(self),
-                *self.address,
-                ssl=self.sslctx,
-                reuse_address=allow_reuse_address,
-                reuse_port=allow_reuse_port,
-                backlog=backlog,
-                start_serving=not defer_start
-            )
-        else:
-            self.server_factory = self.loop.create_server(
-                lambda: self.handler(self),
-                *self.address,
-                ssl=self.sslctx,
-                reuse_address=allow_reuse_address,
-                reuse_port=allow_reuse_port,
-                backlog=backlog
-            )
-
+        # start_serving is new in version 3.7
+        self.server_factory = self.loop.create_server(
+            lambda: self.handler(self),
+            *self.address,
+            ssl=self.sslctx,
+            reuse_address=allow_reuse_address,
+            reuse_port=allow_reuse_port,
+            backlog=backlog,
+            start_serving=not defer_start
+        )
 
 class ModbusUdpServer:
     """
diff --git a/pymodbus/server/asynchronous.py b/pymodbus/server/asynchronous.py
@@ -21,7 +21,6 @@
                                   ModbusAsciiFramer,
                                   ModbusBinaryFramer)
 from pymodbus.pdu import ModbusExceptions as merror
-from pymodbus.internal.ptwisted import InstallManagementConsole
 
 # --------------------------------------------------------------------------- #
 # Logging
@@ -248,8 +247,6 @@ def StartTcpServer(context, identity=None, address=None,
     factory = ModbusServerFactory(context, framer, identity, **kwargs)
     for f in custom_functions:
         factory.decoder.register(f)
-    if console:
-        InstallManagementConsole({'factory': factory})
 
     _logger.info("Starting Modbus TCP Server on %s:%s" % address)
     reactor.listenTCP(address[1], factory, interface=address[0])
@@ -322,10 +319,6 @@ def StartSerialServer(context, identity=None, framer=ModbusAsciiFramer,
     factory = ModbusServerFactory(context, framer, identity, **kwargs)
     for f in custom_functions:
         factory.decoder.register(f)
-    if console:
-        InstallManagementConsole({'factory': factory})
-    if console:
-        InstallManagementConsole({'factory': factory})
 
     protocol = factory.buildProtocol(None)
     SerialPort.getHost = lambda self: port  # hack for logging
diff --git a/setup.py b/setup.py
diff --git a/test/conftest.py b/test/conftest.py
diff --git a/test/test_client_async_asyncio.py b/test/test_client_async_asyncio.py
diff --git a/test/test_server_asyncio.py b/test/test_server_asyncio.py
