7 files changed, 22 insertions, 26 deletions

diff --git a/glucometerutils/drivers/accuchek_reports.py b/glucometerutils/drivers/accuchek_reports.py
index c4d7527..e6dc2ea 100644
--- a/glucometerutils/drivers/accuchek_reports.py
+++ b/glucometerutils/drivers/accuchek_reports.py
@@ -57,7 +57,7 @@ class Device(driver_base.GlucometerDriver):
         report_files = glob.glob(reports_path)
         if not report_files:
             raise exceptions.ConnectionFailed(
-                'No report file found in path "%s".' % reports_path
+                f'No report file found in path "{reports_path}".'
             )
 
         self.report_file = report_files[0]
@@ -80,7 +80,7 @@ class Device(driver_base.GlucometerDriver):
 
     def get_meter_info(self):
         return common.MeterInfo(
-            "%s glucometer" % self.get_model(),
+            f"{self.get_model()} glucometer",
             serial_number=self.get_serial_number(),
             native_unit=self.get_glucose_unit(),
         )
diff --git a/glucometerutils/drivers/fslibre.py b/glucometerutils/drivers/fslibre.py
index 29e821a..4802673 100644
--- a/glucometerutils/drivers/fslibre.py
+++ b/glucometerutils/drivers/fslibre.py
@@ -162,28 +162,24 @@ def _parse_arresult(record):
         comment_parts.append("Medication")
 
     if parsed_record["food-flag"]:
-        if parsed_record["food-carbs-grams"]:
-            comment_parts.append("Food (%d g)" % parsed_record["food-carbs-grams"])
+        grams = parsed_record["food-carbs-grams"]
+        if grams:
+            comment_parts.append(f"Food ({grams} g)")
         else:
             comment_parts.append("Food")
 
     if parsed_record["long-acting-flag"]:
-        if parsed_record["double-long-acting-insulin"]:
-            comment_parts.append(
-                "Long-acting insulin (%.1f)"
-                % (parsed_record["double-long-acting-insulin"] / 2.0)
-            )
+        insulin = parsed_record["double-long-acting-insulin"] / 2
+        if insulin:
+            comment_parts.append(f"Long-acting insulin ({insulin:.1f})")
         else:
             comment_parts.append("Long-acting insulin")
 
     if parsed_record["rapid-acting-flag"]:
-        # provide default value, as this record does not always exist
-        # (even if rapid-acting-flag is set)
-        if parsed_record.get("double-rapid-acting-insulin", 0):
-            comment_parts.append(
-                "Rapid-acting insulin (%.1f)"
-                % (parsed_record["double-rapid-acting-insulin"] / 2.0)
-            )
+        # This record does not always exist, so calculate it only when present.
+        if "double-rapid-acting-insulin" in parsed_record:
+            rapid_insulin = parsed_record["double-rapid-acting-insulin"] / 2
+            comment_parts.append(f"Rapid-acting insulin ({rapid_insulin:.1f})")
         else:
             comment_parts.append("Rapid-acting insulin")
 
diff --git a/glucometerutils/drivers/fsoptium.py b/glucometerutils/drivers/fsoptium.py
index 5c3971e..77244af 100644
--- a/glucometerutils/drivers/fsoptium.py
+++ b/glucometerutils/drivers/fsoptium.py
@@ -89,7 +89,7 @@ class Device(serial.SerialDevice, driver_base.GlucometerDriver):
     DEFAULT_CABLE_ID = "1a61:3420"
 
     def _send_command(self, command):
-        cmd_bytes = bytes("$%s\r\n" % command, "ascii")
+        cmd_bytes = bytes(f"$%s\r\n" % command, "ascii")
         logging.debug("Sending command: %r", cmd_bytes)
 
         self.serial_.write(cmd_bytes)
diff --git a/glucometerutils/drivers/otultraeasy.py b/glucometerutils/drivers/otultraeasy.py
index 0d1e7a9..ba8067f 100644
--- a/glucometerutils/drivers/otultraeasy.py
+++ b/glucometerutils/drivers/otultraeasy.py
@@ -152,8 +152,7 @@ class Device(serial.SerialDevice, driver_base.GlucometerDriver):
             pkt.link_control.sequence_number != self.expect_receive_
         ):
             raise lifescan.MalformedCommand(
-                "at position 2[0b] expected %02x, received %02x"
-                % (self.expect_receive_, pkt.link_connect.sequence_count)
+                f"at position 2[0b] expected {self.expect_receive_:02x}, received {pkt.link_connect.sequence_count:02x}"
             )
 
         return pkt
diff --git a/glucometerutils/drivers/otverio2015.py b/glucometerutils/drivers/otverio2015.py
index b8429ea..fee84f0 100644
--- a/glucometerutils/drivers/otverio2015.py
+++ b/glucometerutils/drivers/otverio2015.py
@@ -123,7 +123,7 @@ class Device(driver_base.GlucometerDriver):
         vendor = inq.result["t10_vendor_identification"][:32]
         if vendor != b"LifeScan":
             raise exceptions.ConnectionFailed(
-                "Device %s is not a LifeScan glucometer." % self.device_name_
+                f"Device {self.device_name_} is not a LifeScan glucometer."
             )
 
     def disconnect(self):  # pylint: disable=no-self-use
@@ -176,10 +176,11 @@ class Device(driver_base.GlucometerDriver):
         return response.value
 
     def get_meter_info(self):
+        model = self._query_string("model")
         return common.MeterInfo(
-            "OneTouch %s glucometer" % self._query_string("model"),
+            f"OneTouch {model} glucometer",
             serial_number=self.get_serial_number(),
-            version_info=("Software version: " + self.get_version(),),
+            version_info=(f"Software version: {self.get_version()}",),
             native_unit=self.get_glucose_unit(),
         )
 
diff --git a/glucometerutils/drivers/sdcodefree.py b/glucometerutils/drivers/sdcodefree.py
index 47dd9ca..08a3afc 100644
--- a/glucometerutils/drivers/sdcodefree.py
+++ b/glucometerutils/drivers/sdcodefree.py
@@ -105,14 +105,14 @@ class Device(serial.SerialDevice, driver_base.GlucometerDriver):
                 continue
             if challenge != b"\x53":
                 raise exceptions.ConnectionFailed(
-                    message="Unexpected starting bytes %r" % challenge
+                    message=f"Unexpected starting bytes {challenge!r}"
                 )
 
         challenge += self.serial_.read(6)
 
         if challenge != _CHALLENGE_PACKET_FULL:
             raise exceptions.ConnectionFailed(
-                message="Unexpected challenge %r" % challenge
+                message=f"Unexpected challenge {challenge!r}"
             )
 
         logging.debug("challenge packet received: %s", binascii.hexlify(challenge))
diff --git a/glucometerutils/drivers/td4277.py b/glucometerutils/drivers/td4277.py
index 0385299..106166e 100644
--- a/glucometerutils/drivers/td4277.py
+++ b/glucometerutils/drivers/td4277.py
@@ -157,7 +157,7 @@ class Device(serial.SerialDevice, driver_base.GlucometerDriver):
         )
         if response_command not in _VALID_CONNECT_RESPONSE:
             raise exceptions.ConnectionFailed(
-                "Invalid response received: %2x %r" % (response_command, message)
+                f"Invalid response received: {response_command:02x} {message!r}"
             )
 
         _, model_message = self._send_command(_GET_MODEL)
@@ -165,7 +165,7 @@ class Device(serial.SerialDevice, driver_base.GlucometerDriver):
             _MODEL_STRUCT.parse(model_message)
         except construct.ConstructError:
             raise exceptions.ConnectionFailed(
-                "Invalid model identified: %r" % model_message
+                f"Invalid model identified: {model_message!r}"
             )
 
     def disconnect(self):