Clean up all !r

Author: bouwew

plugwise_usb/connection/receiver.py

@@ -510,7 +510,7 @@ async def _notify_node_response_subscribers(
         node_response.retries += 1
         self._delayed_processing_tasks[node_response.seq_id] = self._loop.create_task(
             self._put_message_in_queue(node_response, 0.1 * node_response.retries),
-            name=f"Postpone subscription task for {node_response.seq_id!r} retry {node_response.retries}",
+            name=f"Postpone subscription task for {node_response.seq_id} retry {node_response.retries}",
         )
 
 # endregion

plugwise_usb/messages/requests.py

@@ -114,7 +114,7 @@ def __repr__(self) -> str:
         """Convert request into writable str."""
         if self._seq_id is None:
             return f"{self.__class__.__name__} (mac={self.mac_decoded}, seq_id=UNKNOWN, attempt={self._send_counter})"
-        return f"{self.__class__.__name__} (mac={self.mac_decoded}, seq_id={self._seq_id!r}, attempt={self._send_counter})"
+        return f"{self.__class__.__name__} (mac={self.mac_decoded}, seq_id={self._seq_id}, attempt={self._send_counter})"
 
     def response_future(self) -> Future[PlugwiseResponse]:
         """Return awaitable future with response message."""
@@ -142,7 +142,7 @@ def seq_id(self, seq_id: bytes) -> None:
                 "Unable to change seq_id into %s for request %s", seq_id, self
             )
             raise MessageError(
-                f"Unable to set seq_id to {seq_id!r}. Already set to {self._seq_id!r}"
+                f"Unable to set seq_id to {seq_id}. Already set to {self._seq_id}"
             )
         self._seq_id = seq_id
 

plugwise_usb/messages/responses.py

@@ -117,7 +117,7 @@ def __init__(
 
     def __repr__(self) -> str:
         """Convert request into writable str."""
-        return f"{self.__class__.__name__} (mac={self.mac_decoded}, seq_id={self._seq_id!r}, retries={self._retries})"
+        return f"{self.__class__.__name__} (mac={self.mac_decoded}, seq_id={self._seq_id}, retries={self._retries})"
 
     @property
     def retries(self) -> int:
@@ -161,7 +161,7 @@ def deserialize(self, response: bytes, has_footer: bool = True) -> None:
         if (check := self.calculate_checksum(response[:-4])) != response[-4:]:
             raise MessageError(
                 f"Invalid checksum for {self.__class__.__name__}, "
-                + f"expected {check!r} got "
+                + f"expected {check} got "
                 + str(response[-4:]),
             )
         response = response[:-4]
@@ -170,8 +170,8 @@ def deserialize(self, response: bytes, has_footer: bool = True) -> None:
         if self._identifier != response[:4]:
             raise MessageError(
                 "Invalid message identifier received "
-                + f"expected {self._identifier!r} "
-                + f"got {response[:4]!r}"
+                + f"expected {self._identifier} "
+                + f"got {response[:4]}"
             )
         self._seq_id = response[4:8]
         response = response[8:]
@@ -229,8 +229,8 @@ def __init__(self) -> None:
     def __repr__(self) -> str:
         """Convert request into writable str."""
         if self.ack_id is None:
-            return f"StickResponse (seq_id={self._seq_id!r}, retries={self._retries}, ack=UNKNOWN)"
-        return f"StickResponse (seq_id={self._seq_id!r}, retries={self._retries}, ack={StickResponseType(self.ack_id).name})"
+            return f"StickResponse (seq_id={self._seq_id}, retries={self._retries}, ack=UNKNOWN)"
+        return f"StickResponse (seq_id={self._seq_id}, retries={self._retries}, ack={StickResponseType(self.ack_id).name})"
 
     @property
     def response_type(self) -> StickResponseType:
@@ -1026,4 +1026,4 @@ def get_message_object(  # noqa: C901
         return SenseReportResponse()
     if identifier == b"0139":
         return CircleRelayInitStateResponse()
-    raise MessageError(f"Unknown message for identifier {identifier!r}")
+    raise MessageError(f"Unknown message for identifier {identifier}")

plugwise_usb/nodes/circle.py

@@ -659,7 +659,7 @@ async def set_relay(self, state: bool) -> bool:
             return True
 
         raise NodeError(
-            f"Unexpected NodeResponseType {response.ack_id!r} received "
+            f"Unexpected NodeResponseType {response.ack_id} received "
             + "in response to CircleRelaySwitchRequest for node {self.mac}"
         )