Modernize %-operator formatting

Author: bouwew

tests/stick_test_data.py

@@ -20,11 +20,10 @@
 for x in range(168):
     delta_month = hour_timestamp - hour_timestamp.replace(day=1, hour=0)
     LOG_TIMESTAMPS[x] = (
-        bytes(("%%0%dX" % 2) % (hour_timestamp.year - 2000), pw_constants.UTF8)  # noqa: UP031
-        + bytes(("%%0%dX" % 2) % hour_timestamp.month, pw_constants.UTF8)  # noqa: UP031
+        bytes(f"{(hour_timestamp.year - 2000):02x}", pw_constants.UTF8)
+        + bytes(f"{hour_timestamp.month:02x}", pw_constants.UTF8)
         + bytes(
-            ("%%0%dX" % 4)  # noqa: UP031
-            % int((delta_month.days * 1440) + (delta_month.seconds / 60)),
+            f"{int((delta_month.days * 1440) + (delta_month.seconds / 60)):04x}",
             pw_constants.UTF8,
         )
     )
@@ -599,15 +598,13 @@
         b"000000C1",  # Success ack
         b"003A"  # msg_id
         + b"0098765432101234"  # mac
-        + bytes(
-            ("%%0%dd" % 2) % (utc_now + timedelta(seconds=10)).second, pw_constants.UTF8
-        )  # noqa: UP031
-        + bytes(("%%0%dd" % 2) % utc_now.minute, pw_constants.UTF8)  # noqa: UP031
-        + bytes(("%%0%dd" % 2) % utc_now.hour, pw_constants.UTF8)  # noqa: UP031
-        + bytes(("%%0%dd" % 2) % utc_now.weekday(), pw_constants.UTF8)  # noqa: UP031
-        + bytes(("%%0%dd" % 2) % utc_now.day, pw_constants.UTF8)  # noqa: UP031
-        + bytes(("%%0%dd" % 2) % utc_now.month, pw_constants.UTF8)  # noqa: UP031
-        + bytes(("%%0%dd" % 2) % (utc_now.year - 2000), pw_constants.UTF8),  # noqa: UP031
+        + bytes(f"{(utc_now + timedelta(seconds=10)).second:02d}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.minute:02d}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.hour:02d}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.weekday():02d}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.day:02d}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.month:02d}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{(utc_now.year - 2000):02d}", pw_constants.UTF8),  # noqa: UP031
     ),
     b"\x05\x05\x03\x0300280098765432101234000022030304259DDF\r\n": (
         "Circle+ Realtime set clock for 0098765432101234",
@@ -619,12 +616,10 @@
         b"000000C1",  # Success ack
         b"003F"  # msg_id
         + b"1111111111111111"  # mac
-        + bytes(("%%0%dX" % 2) % utc_now.hour, pw_constants.UTF8)  # noqa: UP031
-        + bytes(("%%0%dX" % 2) % utc_now.minute, pw_constants.UTF8)  # noqa: UP031
-        + bytes(
-            ("%%0%dX" % 2) % (utc_now + timedelta(seconds=10)).second, pw_constants.UTF8
-        )  # noqa: UP031
-        + bytes(("%%0%dX" % 2) % utc_now.weekday(), pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.hour:02x}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.minute:02x}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{(utc_now + timedelta(seconds=10)).second:02x}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.weekday():02d}", pw_constants.UTF8)  # noqa: UP031
         + b"00"  # unknown
         + b"0000",  # unknown2
     ),
@@ -633,10 +628,10 @@
         b"000000C1",  # Success ack
         b"003F"  # msg_id
         + b"2222222222222222"  # mac
-        + bytes(("%%0%dX" % 2) % utc_now.hour, pw_constants.UTF8)  # noqa: UP031
-        + bytes(("%%0%dX" % 2) % utc_now.minute, pw_constants.UTF8)  # noqa: UP031
-        + bytes(("%%0%dX" % 2) % utc_now.second, pw_constants.UTF8)  # noqa: UP031
-        + bytes(("%%0%dX" % 2) % utc_now.weekday(), pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.hour:02x}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.minute:02x}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.second:02x}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.weekday():02x}", pw_constants.UTF8)  # noqa: UP031
         + b"00"  # unknown
         + b"0000",  # unknown2
     ),
@@ -645,10 +640,10 @@
         b"000000C1",  # Success ack
         b"003F"  # msg_id
         + b"3333333333333333"  # mac
-        + bytes(("%%0%dX" % 2) % utc_now.hour, pw_constants.UTF8)  # noqa: UP031
-        + bytes(("%%0%dX" % 2) % utc_now.minute, pw_constants.UTF8)  # noqa: UP031
-        + bytes(("%%0%dX" % 2) % utc_now.second, pw_constants.UTF8)  # noqa: UP031
-        + bytes(("%%0%dX" % 2) % utc_now.weekday(), pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.hour:02x}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.minute:02x}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.second:02x}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.weekday():02x}", pw_constants.UTF8)  # noqa: UP031
         + b"00"  # unknown
         + b"0000",  # unknown2
     ),
@@ -657,10 +652,10 @@
         b"000000C1",  # Success ack
         b"003F"  # msg_id
         + b"4444444444444444"  # mac
-        + bytes(("%%0%dX" % 2) % utc_now.hour, pw_constants.UTF8)  # noqa: UP031
-        + bytes(("%%0%dX" % 2) % utc_now.minute, pw_constants.UTF8)  # noqa: UP031
-        + bytes(("%%0%dX" % 2) % utc_now.second, pw_constants.UTF8)  # noqa: UP031
-        + bytes(("%%0%dX" % 2) % utc_now.weekday(), pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.hour:02x}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.minute:02x}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.second:02x}", pw_constants.UTF8)  # noqa: UP031
+        + bytes(f"{utc_now.weekday():02x}", pw_constants.UTF8)  # noqa: UP031
         + b"00"  # unknown
         + b"0000",  # unknown2
     ),