Consistent ImportError messages

Author: alexrudd2

pymodbus/client/serial.py

@@ -1,7 +1,6 @@
 """Modbus client async serial communication."""
 import asyncio
 import time
-from contextlib import suppress
 from functools import partial
 from typing import Any, Type
 
@@ -14,8 +13,13 @@
 from pymodbus.utilities import ModbusTransactionState
 
 
-with suppress(ImportError):
+try:
     import serial
+except ImportError:
+    raise ImportError(
+        "Serial client requires pyserial"
+        'Please install with "pip install pyserial" and try again.'
+    )
 
 
 class AsyncModbusSerialClient(ModbusBaseClient, asyncio.Protocol):

pymodbus/server/async_io.py

@@ -23,10 +23,6 @@
 from pymodbus.transport import CommParams, CommType, ModbusProtocol
 
 
-with suppress(ImportError):
-    pass
-
-
 # --------------------------------------------------------------------------- #
 # Protocol Handlers
 # --------------------------------------------------------------------------- #

pymodbus/server/reactive/main.py

@@ -15,11 +15,10 @@
 try:
     from aiohttp import web
 except ImportError:
-    print(
+    raise ImportError(
         "Reactive server requires aiohttp. "
         'Please install with "pip install aiohttp" and try again.'
     )
-    sys.exit(1)
 
 from pymodbus import __version__ as pymodbus_version
 from pymodbus.datastore import ModbusServerContext, ModbusSlaveContext

pymodbus/server/simulator/http_server.py

@@ -9,8 +9,13 @@
 from typing import List
 
 
-with contextlib.suppress(ImportError):
+try:
     from aiohttp import web
+except ImportError:
+    raise ImportError(
+        "Simulator server requires aiohttp. "
+        'Please install with "pip install aiohttp" and try again.'
+    )
 
 from pymodbus.datastore import ModbusServerContext, ModbusSimulatorContext
 from pymodbus.datastore.simulator import Label
@@ -124,8 +129,6 @@ def __init__(
         custom_actions_module: str = None,
     ):
         """Initialize http interface."""
-        if not web:
-            raise RuntimeError("aiohttp not installed!")
         with open(json_file, encoding="utf-8") as file:
             setup = json.load(file)