transport_serial -> serialtransport. (#1933)

Author: janiversen

pymodbus/transport/__init__.py

@@ -2,21 +2,13 @@
 __all__ = [
     "CommParams",
     "CommType",
-    "create_serial_connection",
     "ModbusProtocol",
-    "NullModem",
     "NULLMODEM_HOST",
-    "SerialTransport",
 ]
 
 from pymodbus.transport.transport import (
     NULLMODEM_HOST,
     CommParams,
     CommType,
     ModbusProtocol,
-    NullModem,
-)
-from pymodbus.transport.transport_serial import (
-    SerialTransport,
-    create_serial_connection,
 )

pymodbus/transport/transport_serial.py renamed to pymodbus/transport/serialtransport.py

@@ -32,7 +32,7 @@ def setup(self):
         """Prepare to read/write."""
         if os.name == "nt" or self.force_poll:
             self.poll_task = asyncio.create_task(self._polling_task())
-            self.poll_task.set_name("transport_serial poll")
+            self.poll_task.set_name("SerialTransport poll")
         else:
             self.async_loop.add_reader(self.sync_serial.fileno(), self._read_ready)
         self.async_loop.call_soon(self._protocol.connection_made, self)

pymodbus/transport/transport.py

@@ -57,7 +57,7 @@
 from typing import Any, Callable, Coroutine
 
 from pymodbus.logging import Log
-from pymodbus.transport.transport_serial import create_serial_connection
+from pymodbus.transport.serialtransport import create_serial_connection
 
 
 NULLMODEM_HOST = "__pymodbus_nullmodem"

test/conftest.py

@@ -8,7 +8,7 @@
 import pytest
 
 from pymodbus.datastore import ModbusBaseSlaveContext
-from pymodbus.transport import NullModem
+from pymodbus.transport.transport import NullModem
 
 
 def pytest_configure():

test/sub_transport/conftest.py

@@ -10,8 +10,8 @@
     CommParams,
     CommType,
     ModbusProtocol,
-    NullModem,
 )
+from pymodbus.transport.transport import NullModem
 
 
 class DummyProtocol(ModbusProtocol):

test/sub_transport/test_basic.py

@@ -8,7 +8,7 @@
     CommType,
     ModbusProtocol,
 )
-from pymodbus.transport.transport_serial import (
+from pymodbus.transport.serialtransport import (
     SerialTransport,
     create_serial_connection,
 )
@@ -274,7 +274,7 @@ def test_generate_ssl(self, use_clc):
 
 
 @mock.patch(
-    "pymodbus.transport.transport_serial.serial.serial_for_url", mock.MagicMock()
+    "pymodbus.transport.serialtransport.serial.serial_for_url", mock.MagicMock()
 )
 class TestBasicSerial:
     """Test transport serial module."""

test/sub_transport/test_comm.py

@@ -10,7 +10,7 @@
     CommType,
     ModbusProtocol,
 )
-from pymodbus.transport.transport_serial import SerialTransport
+from pymodbus.transport.serialtransport import SerialTransport
 
 
 FACTOR = 1.2 if not pytest.IS_WINDOWS else 4.2

test/sub_transport/test_nullmodem.py

@@ -3,7 +3,7 @@
 
 import pytest
 
-from pymodbus.transport import NullModem
+from pymodbus.transport.transport import NullModem
 
 
 class TestNullModem: