Fix ruff UP findings

bindings/python/broker/__init__.py

@@ -48,7 +48,7 @@ def __ne__(self, other):
     utc = UTC()
 
 Version = _broker.Version
-Version.string = lambda: "%u.%u.%u" % (Version.MAJOR, Version.MINOR, Version.PATCH)
+Version.string = lambda: f"{Version.MAJOR}.{Version.MINOR}.{Version.PATCH}"
 
 now = _broker.now
 
@@ -573,7 +573,7 @@ def __init__(self, x=None):
             _broker.Data.__init__(self, v)
 
         elif isinstance(x, set) or isinstance(x, frozenset):
-            s = _broker.Set(([Data(i) for i in x]))
+            s = _broker.Set([Data(i) for i in x])
             _broker.Data.__init__(self, s)
 
         elif isinstance(x, dict) or isinstance(x, types.MappingProxyType):

broker-throughput/broker-throughput.py

@@ -26,23 +26,17 @@ def printStats(stats):
     global last_t, last_sent_ev1
     now = time.time()
     # rate = "sending at {:.2f} ev/s, receiving at {:.2f} ev/s".format(total_sent_ev1 / (now - first_t) , total_recv_ev1 / (now - first_t))
-    rate = "sending at {:.2f} ev/s, receiving at {:.2f} ev/s".format(
-        (total_sent_ev1 - last_sent_ev1) / (now - last_t), ev1 / dt.total_seconds()
-    )
+    rate = f"sending at {(total_sent_ev1 - last_sent_ev1) / (now - last_t):.2f} ev/s, receiving at {ev1 / dt.total_seconds():.2f} ev/s"
     last_t = now
     last_sent_ev1 = total_sent_ev1
 
     print(
-        "{} dt={} ev{}={} (total {} of {}) {}".format(
-            t, dt, event, ev1, total_recv_ev1, total_sent_ev1, rate
-        )
+        f"{t} dt={dt} ev{event}={ev1} (total {total_recv_ev1} of {total_sent_ev1}) {rate}"
     )
 
 
 def sendBatch(p, num):
-    event_1s = [
-        broker.zeek.Event("event_{}".format(event), [i, "test"]) for i in range(num)
-    ]
+    event_1s = [broker.zeek.Event(f"event_{event}", [i, "test"]) for i in range(num)]
     for e in event_1s:
         p.publish(e)
 

doc/_examples/ping.py

@@ -26,4 +26,4 @@
         # Wait for "pong" reply event.
         (t, d) = sub.get()
         pong = broker.zeek.Event(d)
-        print("received {}{}".format(pong.name(), pong.args()))
+        print(f"received {pong.name()}{pong.args()}")

doc/conf.py

@@ -45,7 +45,7 @@
 # built documents.
 #
 # The short X.Y version.
-with open("../VERSION", "r") as f:
+with open("../VERSION") as f:
     version = f.readline().strip()
 
 # The full version, including alpha/beta/rc tags.

doc/extensions/numsec.py

@@ -39,7 +39,7 @@ def __init__(self, env):
         sphinx.domains.std.StandardDomain.__init__(self, env)
 
     def resolve_xref(self, env, fromdocname, builder, typ, target, node, contnode):
-        res = super(CustomStandardDomain, self).resolve_xref(
+        res = super().resolve_xref(
             env, fromdocname, builder, typ, target, node, contnode
         )
 

ruff.toml

@@ -11,4 +11,4 @@ exclude = ["auxil",
            "tests/btest//store"]
 
 [lint]
-select = ["C4", "I", "ISC"]
+select = ["C4", "I", "ISC", "UP"]

tests/btest/scripts/extract-json-keys.py

@@ -20,7 +20,7 @@ def rec_scan_keys(xs, prefix):
         if not prefix:
             full_key = key
         else:
-            full_key = "{}.{}".format(prefix, key)
+            full_key = f"{prefix}.{key}"
         keys.append(full_key)
         if type(val) is dict:
             rec_scan_keys(val, full_key)
@@ -47,7 +47,7 @@ def do_scan(fname):
     else:
         required_keys.split(",")
     # Check that each required key exists in the input.
-    print("required_keys: {}".format(required_keys))
+    print(f"required_keys: {required_keys}")
     for key in required_keys:
         if not key in keys:
             sys.exit(1)

tests/btest/scripts/wire_format.py

@@ -268,7 +268,7 @@ def write_op_msg(fd, src, dst, tag, topic, buf):
     fd.send(src.bytes)  # sender UUID
     fd.send(dst.bytes)  # receiver UUID
     fd.send(int(tag).to_bytes(1, byteorder="big", signed=False))  # msg type
-    fd.send(int(1).to_bytes(2, byteorder="big", signed=False))  # ttl
+    fd.send((1).to_bytes(2, byteorder="big", signed=False))  # ttl
     fd.send(len(topic).to_bytes(2, byteorder="big", signed=False))
     fd.send(topic.encode())
     fd.send(buf)

tests/python/broker-cluster-benchmark.py

@@ -35,7 +35,7 @@ def prepare_environment(self):
         file_path = os.path.join(self.test_dir, "integration", file_name)
         with zipfile.ZipFile(file_path, "r") as zip_ref:
             zip_ref.extractall(self.input_dir)
-        with open(os.path.join(self.recording_dir, "expected-tpl.conf"), mode="r") as f:
+        with open(os.path.join(self.recording_dir, "expected-tpl.conf")) as f:
             format_vars = {"path": self.recording_dir}
             self.expected = f.read() % format_vars
 

tests/python/zeek.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import multiprocessing
 import unittest
 from datetime import datetime