Enable pyupgrade (U) rules in ruff (#1484)

Author: alexrudd2

pymodbus/client/base.py

@@ -4,7 +4,7 @@
 import asyncio
 import socket
 from dataclasses import dataclass
-from typing import Any, Callable, Optional, Tuple, Type
+from typing import Any, Callable
 
 from pymodbus.client.mixin import ModbusClientMixin
 from pymodbus.constants import Defaults
@@ -70,7 +70,7 @@ class _params:  # pylint: disable=too-many-instance-attributes
 
         host: str = None
         port: str | int = None
-        framer: Type[ModbusFramer] = None
+        framer: type[ModbusFramer] = None
         timeout: float = None
         retries: int = None
         retry_on_empty: bool = None
@@ -80,15 +80,15 @@ class _params:  # pylint: disable=too-many-instance-attributes
         kwargs: dict = None
         reconnect_delay: int = None
         reconnect_delay_max: int = None
-        on_reconnect_callback: Optional[Callable[[], None]] = None
+        on_reconnect_callback: Callable[[], None] | None = None
 
         baudrate: int = None
         bytesize: int = None
         parity: str = None
         stopbits: int = None
         handle_local_echo: bool = None
 
-        source_address: Tuple[str, int] = None
+        source_address: tuple[str, int] = None
 
         sslctx: str = None
         certfile: str = None
@@ -98,7 +98,7 @@ class _params:  # pylint: disable=too-many-instance-attributes
 
     def __init__(  # pylint: disable=too-many-arguments
         self,
-        framer: Type[ModbusFramer] = None,
+        framer: type[ModbusFramer] = None,
         timeout: str | float = Defaults.Timeout,
         retries: str | int = Defaults.Retries,
         retry_on_empty: bool = Defaults.RetryOnEmpty,
@@ -107,7 +107,7 @@ def __init__(  # pylint: disable=too-many-arguments
         broadcast_enable: bool = Defaults.BroadcastEnable,
         reconnect_delay: int = Defaults.ReconnectDelay,
         reconnect_delay_max: int = Defaults.ReconnectDelayMax,
-        on_reconnect_callback: Optional[Callable[[], None]] = None,
+        on_reconnect_callback: Callable[[], None] | None = None,
         **kwargs: Any,
     ) -> None:
         """Initialize a client instance."""

pymodbus/client/serial.py

@@ -220,7 +220,7 @@ def __init__(
 
         self.last_frame_end = None
 
-        self._t0 = float((1 + 8 + 2)) / self.params.baudrate
+        self._t0 = float(1 + 8 + 2) / self.params.baudrate
 
         """
         The minimum delay is 0.01s and the maximum can be set to 0.05s.

pymodbus/factory.py

@@ -202,7 +202,7 @@ def _helper(self, data):
             Log.debug("Factory Request[{}]", function_code)
             request = IllegalFunctionRequest(function_code)
         else:
-            fc_string = "%s: %s" % (  # pylint: disable=consider-using-f-string
+            fc_string = "{}: {}".format(  # pylint: disable=consider-using-f-string
                 str(self.lookup[function_code])  # pylint: disable=use-maxsplit-arg
                 .split(".")[-1]
                 .rstrip('">"'),
@@ -331,7 +331,7 @@ def _helper(self, data):
         """
         fc_string = function_code = int(data[0])
         if function_code in self.lookup:
-            fc_string = "%s: %s" % (  # pylint: disable=consider-using-f-string
+            fc_string = "{}: {}".format(  # pylint: disable=consider-using-f-string
                 str(self.lookup[function_code])  # pylint: disable=use-maxsplit-arg
                 .split(".")[-1]
                 .rstrip('">"'),

pymodbus/framer/ascii_framer.py

@@ -196,15 +196,10 @@ def buildPacket(self, message):
         checksum = computeLRC(encoded + buffer)
 
         packet = bytearray()
-        params = (message.slave_id, message.function_code)
         packet.extend(self._start)
-        packet.extend(
-            ("%02x%02x" % params).encode()  # pylint: disable=consider-using-f-string
-        )
+        packet.extend(f"{message.slave_id:02x}{message.function_code:02x}".encode())
         packet.extend(b2a_hex(encoded))
-        packet.extend(
-            ("%02x" % checksum).encode()  # pylint: disable=consider-using-f-string
-        )
+        packet.extend(f"{checksum:02x}".encode())
         packet.extend(self._end)
         return bytes(packet).upper()
 

pymodbus/payload.py

@@ -67,9 +67,7 @@ def _pack_words(self, fstring, value):
         :param value: Value to be packed
         :return:
         """
-        value = pack(
-            "!{}".format(fstring), value  # pylint: disable=consider-using-f-string
-        )
+        value = pack(f"!{fstring}", value)
         wordorder = WC.get(fstring.lower()) // 2
         upperbyte = f"!{wordorder}H"
         payload = unpack(upperbyte, value)

ruff.toml

@@ -26,6 +26,7 @@ select = [
     "SIM300",
     "SIM401",
     "RUF",
+    "U",
 ]
 [pydocstyle]
 convention = "pep257"