From ff9f761ebc2c5f5ec3b8923ded66d452a66723df Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 20 Aug 2024 12:37:52 +0200 Subject: [PATCH] address upcoming UP031 lint --- examples/device/device.py | 2 +- examples/draft/client-server.py | 4 ++-- examples/eventloop/asyncweb.py | 2 +- examples/gevent/poll.py | 2 +- examples/heartbeat/ping.py | 2 +- examples/logger/zmqlogger.py | 8 ++++---- examples/monitoring/simple_monitor.py | 2 +- examples/monitoring/zmq_monitor_class.py | 4 ++-- examples/serialization/serialsocket.py | 4 ++-- perf/collect.py | 2 +- perf/perf.py | 8 ++++---- tests/test_auth.py | 2 +- tests/test_device.py | 20 ++++++++++---------- tests/test_monqueue.py | 10 +++++----- tests/test_proxy_steerable.py | 18 +++++++++--------- tests/test_security.py | 8 ++++---- tests/test_socket.py | 2 +- tests/test_zmqstream.py | 2 +- zmq/backend/cffi/socket.py | 4 ++-- zmq/devices/basedevice.py | 6 +++--- zmq/devices/proxydevice.py | 2 +- zmq/devices/proxysteerabledevice.py | 2 +- zmq/green/core.py | 4 ++-- zmq/ssh/tunnel.py | 21 ++++----------------- zmq/sugar/socket.py | 6 +----- zmq/sugar/version.py | 2 +- zmq/utils/z85.py | 8 ++++---- 27 files changed, 70 insertions(+), 87 deletions(-) diff --git a/examples/device/device.py b/examples/device/device.py index b10d59eb9..1864aa89b 100644 --- a/examples/device/device.py +++ b/examples/device/device.py @@ -19,7 +19,7 @@ def produce(url, ident): s.connect(url) print(f"Producing {ident}") for i in range(MSGS): - s.send(('%s: %i' % (ident, time.time())).encode('utf8')) + s.send((f'{ident}: {time.time():.0f}').encode()) time.sleep(1) print(f"Producer {ident} done") s.close() diff --git a/examples/draft/client-server.py b/examples/draft/client-server.py index 6a5924422..2ae5c3e9e 100644 --- a/examples/draft/client-server.py +++ b/examples/draft/client-server.py @@ -11,10 +11,10 @@ for i in range(10): client = ctx.socket(zmq.CLIENT) client.connect(url) - client.send(b'request %i' % i) + client.send(f'request {i}'.encode("ascii")) msg = server.recv(copy=False) print(f'server recvd {msg.bytes!r} from {msg.routing_id!r}') - server.send_string('reply %i' % i, routing_id=msg.routing_id) + server.send_string(f'reply {i}', routing_id=msg.routing_id) reply = client.recv_string() print(f'client recvd {reply!r}') time.sleep(0.1) diff --git a/examples/eventloop/asyncweb.py b/examples/eventloop/asyncweb.py index b1a377786..39ec7e833 100644 --- a/examples/eventloop/asyncweb.py +++ b/examples/eventloop/asyncweb.py @@ -31,7 +31,7 @@ def slow_responder() -> None: frame, msg = socket.recv_multipart() print(f"\nworker received {msg!r}\n", end='') time.sleep(random.randint(1, 5)) - socket.send_multipart([frame, msg + b" to you too, #%i" % i]) + socket.send_multipart([frame, msg + f" to you too, #{i}".encode()]) i += 1 diff --git a/examples/gevent/poll.py b/examples/gevent/poll.py index c5ad8c50a..dc39fe4d4 100644 --- a/examples/gevent/poll.py +++ b/examples/gevent/poll.py @@ -10,7 +10,7 @@ def sender(): sender.connect('inproc://polltest2') for i in range(10): - sender.send('test %d' % i) + sender.send(f'test {i}') gevent.sleep(1) diff --git a/examples/heartbeat/ping.py b/examples/heartbeat/ping.py index d5e3832f3..a5d2d347a 100644 --- a/examples/heartbeat/ping.py +++ b/examples/heartbeat/ping.py @@ -28,7 +28,7 @@ time.sleep(t) for i in range(4): n += 1 - msg = 'ping %i' % n + msg = f'ping {n}' tic = time.time() req.send_string(msg) resp = req.recv_string() diff --git a/examples/logger/zmqlogger.py b/examples/logger/zmqlogger.py index 196379f42..b169a30b0 100644 --- a/examples/logger/zmqlogger.py +++ b/examples/logger/zmqlogger.py @@ -28,7 +28,7 @@ def sub_logger(port: int, level: int = logging.DEBUG) -> None: ctx = zmq.Context() sub = ctx.socket(zmq.SUB) - sub.bind('tcp://127.0.0.1:%i' % port) + sub.bind(f'tcp://127.0.0.1:{port}') sub.setsockopt(zmq.SUBSCRIBE, b"") logging.basicConfig(level=level) @@ -46,17 +46,17 @@ def sub_logger(port: int, level: int = logging.DEBUG) -> None: def log_worker(port: int, interval: float = 1, level: int = logging.DEBUG) -> None: ctx = zmq.Context() pub = ctx.socket(zmq.PUB) - pub.connect('tcp://127.0.0.1:%i' % port) + pub.connect(f'tcp://127.0.0.1:{port}') logger = logging.getLogger(str(os.getpid())) logger.setLevel(level) handler: PUBHandler = PUBHandler(pub) logger.addHandler(handler) - print("starting logger at %i with level=%s" % (os.getpid(), level)) + print(f"starting logger at {os.getpid()} with level={level}") while True: level = random.choice(LOG_LEVELS) - logger.log(level, "Hello from %i!" % os.getpid()) + logger.log(level, f"Hello from {os.getpid()}!") time.sleep(interval) diff --git a/examples/monitoring/simple_monitor.py b/examples/monitoring/simple_monitor.py index dc96af244..e8553180f 100644 --- a/examples/monitoring/simple_monitor.py +++ b/examples/monitoring/simple_monitor.py @@ -29,7 +29,7 @@ def line() -> None: for name in dir(zmq): if name.startswith('EVENT_'): value = getattr(zmq, name) - print("%21s : %4i" % (name, value)) + print(f"{name:21} : {value:4}") EVENT_MAP[value] = name diff --git a/examples/monitoring/zmq_monitor_class.py b/examples/monitoring/zmq_monitor_class.py index a9f0cbbb9..24e5d69d7 100644 --- a/examples/monitoring/zmq_monitor_class.py +++ b/examples/monitoring/zmq_monitor_class.py @@ -59,7 +59,7 @@ def event_monitor_thread_async( for name in dir(zmq): if name.startswith('EVENT_'): value = getattr(zmq, name) - print("%21s : %4i" % (name, value)) + print(f"{name:21} : {value:4}") EVENT_MAP[value] = name print("\n") @@ -108,7 +108,7 @@ def event_monitor_thread(monitor: zmq.Socket) -> None: for name in dir(zmq): if name.startswith('EVENT_'): value = getattr(zmq, name) - print("%21s : %4i" % (name, value)) + print(f"{name:21} : {value:4}") EVENT_MAP[value] = name print() diff --git a/examples/serialization/serialsocket.py b/examples/serialization/serialsocket.py index 751246b46..ac50b2f5c 100644 --- a/examples/serialization/serialsocket.py +++ b/examples/serialization/serialsocket.py @@ -25,7 +25,7 @@ def send_zipped_pickle( """pack and compress an object with pickle and zlib.""" pobj = pickle.dumps(obj, protocol) zobj = zlib.compress(pobj) - print('zipped pickle is %i bytes' % len(zobj)) + print(f'zipped pickle is {len(zobj)} bytes') return self.send(zobj, flags=flags) def recv_zipped_pickle(self, flags: int = 0) -> Any: @@ -67,7 +67,7 @@ def main() -> None: rep.bind('inproc://a') req.connect('inproc://a') A = numpy.ones((1024, 1024)) - print("Array is %i bytes" % (A.nbytes)) + print(f"Array is {A.nbytes} bytes") # send/recv with pickle+zip req.send_zipped_pickle(A) diff --git a/perf/collect.py b/perf/collect.py index 2594c96b2..fd47311df 100644 --- a/perf/collect.py +++ b/perf/collect.py @@ -46,7 +46,7 @@ def compute_data_point( count = 2 results = [] print(f'copy={copy}, size={size}') - print('%8s %5s %7s' % ('count', 'dt', 'result')) + print(f"{'count':8} {'dt':5} {'result':7}") while duration < t_max: with timer() as get_duration: result = do_run( diff --git a/perf/perf.py b/perf/perf.py index 7e35e9624..6483848ae 100644 --- a/perf/perf.py +++ b/perf/perf.py @@ -133,8 +133,8 @@ def latency(url, count, size, poll=False, copy=True, quiet=False): latency = 1e6 * elapsed / (count * 2.0) if not quiet: - print("message size : %8i [B]" % (size,)) - print("roundtrip count: %8i [msgs]" % (count,)) + print(f"message size : {size:8i} [B]") + print(f"roundtrip count: {count:8i} [msgs]") print(f"mean latency : {latency:12.3f} [µs]") print(f"test time : {elapsed:12.3f} [s]") ctx.destroy() @@ -216,8 +216,8 @@ def throughput(url, count, size, poll=False, copy=True, quiet=False): megabits = throughput * size * 8 / 1e6 if not quiet: - print("message size : %8i [B]" % size) - print("message count : %8i [msgs]" % count) + print(f"message size : {size:8.0f} [B]") + print(f"message count : {count:8.0f} [msgs]") print(f"send only : {send_throughput:8.0f} [msg/s]") print(f"mean throughput: {throughput:8.0f} [msg/s]") print(f"mean throughput: {megabits:12.3f} [Mb/s]") diff --git a/tests/test_auth.py b/tests/test_auth.py index cf6e8a0c4..a22937e89 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -145,7 +145,7 @@ async def can_connect(self, server, client, timeout=1000): result = False iface = 'tcp://127.0.0.1' port = server.bind_to_random_port(iface) - client.connect("%s:%i" % (iface, port)) + client.connect(f"{iface}:{port}") msg = [b"Hello World"] # run poll on server twice # to flush spurious events diff --git a/tests/test_device.py b/tests/test_device.py index 9b4b858e4..1dc1d364c 100644 --- a/tests/test_device.py +++ b/tests/test_device.py @@ -33,7 +33,7 @@ def test_single_socket_forwarder_connect(self): dev = devices.ThreadDevice(zmq.QUEUE, zmq.REP, -1) req = self.context.socket(zmq.REQ) port = req.bind_to_random_port('tcp://127.0.0.1') - dev.connect_in('tcp://127.0.0.1:%i' % port) + dev.connect_in(f'tcp://127.0.0.1:{port}') dev.start() time.sleep(0.25) msg = b'hello' @@ -44,7 +44,7 @@ def test_single_socket_forwarder_connect(self): dev = devices.ThreadDevice(zmq.QUEUE, zmq.REP, -1) req = self.context.socket(zmq.REQ) port = req.bind_to_random_port('tcp://127.0.0.1') - dev.connect_out('tcp://127.0.0.1:%i' % port) + dev.connect_out(f'tcp://127.0.0.1:{port}') dev.start() time.sleep(0.25) msg = b'hello again' @@ -59,7 +59,7 @@ def test_single_socket_forwarder_bind(self): dev = devices.ThreadDevice(zmq.QUEUE, zmq.REP, -1) port = dev.bind_in_to_random_port('tcp://127.0.0.1') req = self.context.socket(zmq.REQ) - req.connect('tcp://127.0.0.1:%i' % port) + req.connect(f'tcp://127.0.0.1:{port}') dev.start() time.sleep(0.25) msg = b'hello' @@ -70,7 +70,7 @@ def test_single_socket_forwarder_bind(self): dev = devices.ThreadDevice(zmq.QUEUE, zmq.REP, -1) port = dev.bind_in_to_random_port('tcp://127.0.0.1') req = self.context.socket(zmq.REQ) - req.connect('tcp://127.0.0.1:%i' % port) + req.connect(f'tcp://127.0.0.1:{port}') dev.start() time.sleep(0.25) msg = b'hello again' @@ -92,7 +92,7 @@ def test_device_bind_to_random_with_args(self): ) for port in ports: if port < min or port > max: - self.fail('Unexpected port number: %i' % port) + self.fail(f'Unexpected port number: {port}') def test_device_bind_to_random_binderror(self): dev = devices.ThreadDevice(zmq.PULL, zmq.PUSH, -1) @@ -117,11 +117,11 @@ def test_proxy(self): time.sleep(0.25) msg = b'hello' push = self.context.socket(zmq.PUSH) - push.connect("%s:%i" % (iface, port)) + push.connect(f"{iface}:{port}") pull = self.context.socket(zmq.PULL) - pull.connect("%s:%i" % (iface, port2)) + pull.connect(f"{iface}:{port2}") mon = self.context.socket(zmq.PULL) - mon.connect("%s:%i" % (iface, port3)) + mon.connect(f"{iface}:{port3}") push.send(msg) self.sockets.extend([push, pull, mon]) assert msg == self.recv(pull) @@ -143,7 +143,7 @@ def test_proxy_bind_to_random_with_args(self): ) for port in ports: if port < min or port > max: - self.fail('Unexpected port number: %i' % port) + self.fail(f'Unexpected port number: {port}') if have_gevent: @@ -158,7 +158,7 @@ def test_green_device(self): self.sockets.extend([req, rep]) port = rep.bind_to_random_port('tcp://127.0.0.1') g = gevent.spawn(zmq.green.device, zmq.QUEUE, rep, rep) - req.connect('tcp://127.0.0.1:%i' % port) + req.connect(f'tcp://127.0.0.1:{port}') req.send(b'hi') timeout = gevent.Timeout(3) timeout.start() diff --git a/tests/test_monqueue.py b/tests/test_monqueue.py index af320f63d..a11ba79d1 100644 --- a/tests/test_monqueue.py +++ b/tests/test_monqueue.py @@ -28,9 +28,9 @@ def build_device(self, mon_sub=b"", in_prefix=b'in', out_prefix=b'out'): mport = mon.bind_to_random_port('tcp://127.0.0.1') mon.setsockopt(zmq.SUBSCRIBE, mon_sub) - self.device.connect_in("tcp://127.0.0.1:%i" % aport) - self.device.connect_out("tcp://127.0.0.1:%i" % bport) - self.device.connect_mon("tcp://127.0.0.1:%i" % mport) + self.device.connect_in(f"tcp://127.0.0.1:{aport}") + self.device.connect_out(f"tcp://127.0.0.1:{bport}") + self.device.connect_mon(f"tcp://127.0.0.1:{mport}") self.device.start() time.sleep(0.2) try: @@ -191,8 +191,8 @@ def test_router_router(self): b.identity = b'b' self.sockets.extend([a, b]) - a.connect('tcp://127.0.0.1:%i' % porta) - b.connect('tcp://127.0.0.1:%i' % portb) + a.connect(f'tcp://127.0.0.1:{porta}') + b.connect(f'tcp://127.0.0.1:{portb}') dev.start() time.sleep(1) if zmq.zmq_version_info() >= (3, 1, 0): diff --git a/tests/test_proxy_steerable.py b/tests/test_proxy_steerable.py index c7dc5aeae..33b03d89d 100644 --- a/tests/test_proxy_steerable.py +++ b/tests/test_proxy_steerable.py @@ -34,13 +34,13 @@ def test_proxy_steerable(self): time.sleep(0.25) msg = b'hello' push = self.context.socket(zmq.PUSH) - push.connect("%s:%i" % (iface, port)) + push.connect(f"{iface}:{port}") pull = self.context.socket(zmq.PULL) - pull.connect("%s:%i" % (iface, port2)) + pull.connect(f"{iface}:{port2}") mon = self.context.socket(zmq.PULL) - mon.connect("%s:%i" % (iface, port3)) + mon.connect(f"{iface}:{port3}") ctrl = self.context.socket(zmq.PAIR) - ctrl.connect("%s:%i" % (iface, port4)) + ctrl.connect(f"{iface}:{port4}") push.send(msg) self.sockets.extend([push, pull, mon, ctrl]) assert msg == self.recv(pull) @@ -65,7 +65,7 @@ def test_proxy_steerable_bind_to_random_with_args(self): ) for port in ports: if port < min or port > max: - self.fail('Unexpected port number: %i' % port) + self.fail(f'Unexpected port number: {port}') def test_proxy_steerable_statistics(self): if zmq.zmq_version_info() < (4, 3): @@ -80,13 +80,13 @@ def test_proxy_steerable_statistics(self): time.sleep(0.25) msg = b'hello' push = self.context.socket(zmq.PUSH) - push.connect("%s:%i" % (iface, port)) + push.connect(f"{iface}:{port}") pull = self.context.socket(zmq.PULL) - pull.connect("%s:%i" % (iface, port2)) + pull.connect(f"{iface}:{port2}") mon = self.context.socket(zmq.PULL) - mon.connect("%s:%i" % (iface, port3)) + mon.connect(f"{iface}:{port3}") ctrl = self.context.socket(zmq.PAIR) - ctrl.connect("%s:%i" % (iface, port4)) + ctrl.connect(f"{iface}:{port4}") push.send(msg) self.sockets.extend([push, pull, mon, ctrl]) assert msg == self.recv(pull) diff --git a/tests/test_security.py b/tests/test_security.py index 93145b9f6..d945c67e8 100644 --- a/tests/test_security.py +++ b/tests/test_security.py @@ -113,7 +113,7 @@ def test_null(self): assert server.plain_server == 0 iface = 'tcp://127.0.0.1' port = server.bind_to_random_port(iface) - client.connect("%s:%i" % (iface, port)) + client.connect(f"{iface}:{port}") self.bounce(server, client, False) def test_plain(self): @@ -139,7 +139,7 @@ def test_plain(self): with self.zap(): iface = 'tcp://127.0.0.1' port = server.bind_to_random_port(iface) - client.connect("%s:%i" % (iface, port)) + client.connect(f"{iface}:{port}") self.bounce(server, client) def skip_plain_inauth(self): @@ -157,7 +157,7 @@ def skip_plain_inauth(self): with self.zap(): iface = 'tcp://127.0.0.1' port = server.bind_to_random_port(iface) - client.connect("%s:%i" % (iface, port)) + client.connect(f"{iface}:{port}") client.send(b'ping') server.rcvtimeo = 250 self.assertRaisesErrno(zmq.EAGAIN, server.recv) @@ -234,5 +234,5 @@ def test_curve(self): with self.zap(): iface = 'tcp://127.0.0.1' port = server.bind_to_random_port(iface) - client.connect("%s:%i" % (iface, port)) + client.connect(f"{iface}:{port}") self.bounce(server, client) diff --git a/tests/test_socket.py b/tests/test_socket.py index 71d07432e..dedc722d3 100644 --- a/tests/test_socket.py +++ b/tests/test_socket.py @@ -328,7 +328,7 @@ def test_tracker(self): sock = socket.socket() sock.bind(('127.0.0.1', 0)) port = sock.getsockname()[1] - iface = "%s:%i" % (addr, port) + iface = f"{addr}:{port}" sock.close() time.sleep(0.1) diff --git a/tests/test_zmqstream.py b/tests/test_zmqstream.py index 39d7d4962..7146efb0f 100644 --- a/tests/test_zmqstream.py +++ b/tests/test_zmqstream.py @@ -27,7 +27,7 @@ async def push_pull(socket): push = zmqstream.ZMQStream(socket(zmq.PUSH)) pull = zmqstream.ZMQStream(socket(zmq.PULL)) port = push.bind_to_random_port('tcp://127.0.0.1') - pull.connect('tcp://127.0.0.1:%i' % port) + pull.connect(f'tcp://127.0.0.1:{port}') return (push, pull) diff --git a/zmq/backend/cffi/socket.py b/zmq/backend/cffi/socket.py index 2d21e10d0..c1eb295ae 100644 --- a/zmq/backend/cffi/socket.py +++ b/zmq/backend/cffi/socket.py @@ -30,7 +30,7 @@ def new_int_pointer(): def new_binary_data(length): - return ffi.new('char[%d]' % length), nsp(ffi.sizeof('char') * length) + return ffi.new(f'char[{length:i}]'), nsp(ffi.sizeof('char') * length) def value_uint64_pointer(val): @@ -46,7 +46,7 @@ def value_int_pointer(val): def value_binary_data(val, length): - return ffi.new('char[%d]' % (length + 1), val), ffi.sizeof('char') * length + return ffi.new(f'char[{length + 1:i}]', val), ffi.sizeof('char') * length ZMQ_FD_64BIT = ffi.sizeof('ZMQ_FD_T') == 8 diff --git a/zmq/devices/basedevice.py b/zmq/devices/basedevice.py index bd4d78290..5591d844a 100644 --- a/zmq/devices/basedevice.py +++ b/zmq/devices/basedevice.py @@ -124,7 +124,7 @@ def bind_in_to_random_port(self, addr: str, *args, **kwargs) -> int: """ port = self._reserve_random_port(addr, *args, **kwargs) - self.bind_in('%s:%i' % (addr, port)) + self.bind_in(f'{addr}:{port}') return port @@ -159,7 +159,7 @@ def bind_out_to_random_port(self, addr: str, *args, **kwargs) -> int: """ port = self._reserve_random_port(addr, *args, **kwargs) - self.bind_out('%s:%i' % (addr, port)) + self.bind_out(f'{addr}:{port}') return port @@ -183,7 +183,7 @@ def _reserve_random_port(self, addr: str, *args, **kwargs) -> int: for i in range(5): port = binder.bind_to_random_port(addr, *args, **kwargs) - new_addr = '%s:%i' % (addr, port) + new_addr = f'{addr}:{port}' if new_addr in self._random_addrs: continue diff --git a/zmq/devices/proxydevice.py b/zmq/devices/proxydevice.py index e52159c50..f2af06793 100644 --- a/zmq/devices/proxydevice.py +++ b/zmq/devices/proxydevice.py @@ -34,7 +34,7 @@ def bind_mon_to_random_port(self, addr, *args, **kwargs): """ port = self._reserve_random_port(addr, *args, **kwargs) - self.bind_mon('%s:%i' % (addr, port)) + self.bind_mon(f'{addr}:{port}') return port diff --git a/zmq/devices/proxysteerabledevice.py b/zmq/devices/proxysteerabledevice.py index ef8289155..256a1e049 100644 --- a/zmq/devices/proxysteerabledevice.py +++ b/zmq/devices/proxysteerabledevice.py @@ -32,7 +32,7 @@ def bind_ctrl_to_random_port(self, addr, *args, **kwargs): """ port = self._reserve_random_port(addr, *args, **kwargs) - self.bind_ctrl('%s:%i' % (addr, port)) + self.bind_ctrl(f'{addr}:{port}') return port diff --git a/zmq/green/core.py b/zmq/green/core.py index c104a9331..fb4872ebd 100644 --- a/zmq/green/core.py +++ b/zmq/green/core.py @@ -155,7 +155,7 @@ def _wait_write(self): and self.getsockopt(zmq.EVENTS) & zmq.POLLOUT ): print( - "BUG: gevent may have missed a libzmq send event on %i!" % self.FD, + f"BUG: gevent may have missed a libzmq send event on {self.FD}!", file=sys.stderr, ) finally: @@ -193,7 +193,7 @@ def _wait_read(self): and self.getsockopt(zmq.EVENTS) & zmq.POLLIN ): print( - "BUG: gevent may have missed a libzmq recv event on %i!" % self.FD, + f"BUG: gevent may have missed a libzmq recv event on {self.FD}!", file=sys.stderr, ) finally: diff --git a/zmq/ssh/tunnel.py b/zmq/ssh/tunnel.py index fd62cd8ba..0e9c88e8a 100644 --- a/zmq/ssh/tunnel.py +++ b/zmq/ssh/tunnel.py @@ -200,7 +200,7 @@ def open_tunnel(addr, server, keyfile=None, password=None, paramiko=None, timeou password=password, timeout=timeout, ) - return 'tcp://127.0.0.1:%i' % lport, tunnel + return f'tcp://127.0.0.1:{lport}', tunnel def openssh_tunnel( @@ -255,25 +255,12 @@ def openssh_tunnel( (output, exitstatus) = pexpect.run(cmd, withexitstatus=True) if not exitstatus: pid = int(output[output.find(b"(pid=") + 5 : output.find(b")")]) - cmd = "%s -O forward -L 127.0.0.1:%i:%s:%i %s" % ( - ssh, - lport, - remoteip, - rport, - server, - ) + cmd = f"{ssh} -O forward -L 127.0.0.1:{lport}:{remoteip}:{rport} {server}" (output, exitstatus) = pexpect.run(cmd, withexitstatus=True) if not exitstatus: atexit.register(_stop_tunnel, cmd.replace("-O forward", "-O cancel", 1)) return pid - cmd = "%s -f -S none -L 127.0.0.1:%i:%s:%i %s sleep %i" % ( - ssh, - lport, - remoteip, - rport, - server, - timeout, - ) + cmd = f"{ssh} -f -S none -L 127.0.0.1:{lport}:{remoteip}:{rport} {server} sleep {timeout}" # pop SSH_ASKPASS from env env = os.environ.copy() @@ -412,7 +399,7 @@ def _paramiko_tunnel(lport, rport, server, remoteip, keyfile=None, password=None # else: # raise except Exception as e: - print('*** Failed to connect to %s:%d: %r' % (server, port, e)) + print(f'*** Failed to connect to {server}:{port}: {e!r}') sys.exit(1) # Don't let SIGINT kill the tunnel subprocess diff --git a/zmq/sugar/socket.py b/zmq/sugar/socket.py index e5e253a34..0f10f3d7b 100644 --- a/zmq/sugar/socket.py +++ b/zmq/sugar/socket.py @@ -746,11 +746,7 @@ def send_multipart( if len(rmsg) > 32: rmsg = rmsg[:32] + '...' raise TypeError( - "Frame %i (%s) does not support the buffer interface." - % ( - i, - rmsg, - ) + f"Frame {i} ({rmsg}) does not support the buffer interface." ) for msg in msg_parts[:-1]: self.send(msg, zmq.SNDMORE | flags, copy=copy, track=track) diff --git a/zmq/sugar/version.py b/zmq/sugar/version.py index 8891cf872..bae418c59 100644 --- a/zmq/sugar/version.py +++ b/zmq/sugar/version.py @@ -54,7 +54,7 @@ def pyzmq_version_info() -> tuple[int, int, int] | tuple[int, int, int, float]: def zmq_version() -> str: """return the version of libzmq as a string""" - return "%i.%i.%i" % zmq_version_info() + return "{}.{}.{}".format(*zmq_version_info()) __all__ = [ diff --git a/zmq/utils/z85.py b/zmq/utils/z85.py index de05fc833..399a5cb1a 100644 --- a/zmq/utils/z85.py +++ b/zmq/utils/z85.py @@ -25,11 +25,11 @@ def encode(rawbytes): """encode raw bytes into Z85""" # Accepts only byte arrays bounded to 4 bytes if len(rawbytes) % 4: - raise ValueError("length must be multiple of 4, not %i" % len(rawbytes)) + raise ValueError(f"length must be multiple of 4, not {len(rawbytes)}") nvalues = len(rawbytes) / 4 - values = struct.unpack('>%dI' % nvalues, rawbytes) + values = struct.unpack(f'>{nvalues}I', rawbytes) encoded = [] for v in values: for offset in _85s: @@ -47,7 +47,7 @@ def decode(z85bytes): raise ValueError('string argument should contain only ASCII characters') if len(z85bytes) % 5: - raise ValueError("Z85 length must be multiple of 5, not %i" % len(z85bytes)) + raise ValueError(f"Z85 length must be multiple of 5, not {len(z85bytes)}") nvalues = len(z85bytes) / 5 values = [] @@ -56,4 +56,4 @@ def decode(z85bytes): for j, offset in enumerate(_85s): value += Z85MAP[z85bytes[i + j]] * offset values.append(value) - return struct.pack('>%dI' % nvalues, *values) + return struct.pack(f'>{nvalues}I', *values)