From 95ada233957dac56eb7dc717ecd3b70ac176c67e Mon Sep 17 00:00:00 2001 From: Mark Paronyan Date: Wed, 30 Sep 2026 20:45:44 +0300 Subject: [PATCH] refactor: replace percent formatting with format specifiers --- gns3server/compute/docker/docker_vm.py | 2 +- gns3server/compute/qemu/utils/ziputils.py | 2 +- gns3server/db/models/base.py | 4 ++-- gns3server/utils/__init__.py | 2 +- gns3server/utils/asyncio/aiozipstream.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gns3server/compute/docker/docker_vm.py b/gns3server/compute/docker/docker_vm.py index 4bb9b4344..4837a8693 100644 --- a/gns3server/compute/docker/docker_vm.py +++ b/gns3server/compute/docker/docker_vm.py @@ -277,7 +277,7 @@ class DockerVM(BaseNode): if not mac_address: # use the node UUID to generate a random MAC address - self._mac_address = "02:42:%s:%s:%s:00" % (self.id[2:4], self.id[4:6], self.id[6:8]) + self._mac_address = "02:42:{}:{}:{}:00".format(self.id[2:4], self.id[4:6], self.id[6:8]) else: self._mac_address = mac_address diff --git a/gns3server/compute/qemu/utils/ziputils.py b/gns3server/compute/qemu/utils/ziputils.py index 95c8816c7..165e5e7ce 100644 --- a/gns3server/compute/qemu/utils/ziputils.py +++ b/gns3server/compute/qemu/utils/ziputils.py @@ -52,4 +52,4 @@ def unpack_zip(filename, extract_dir=None): for fname, date_time in reversed(dirs): os.utime(fname, (date_time, date_time)) except zipfile.BadZipFile: - raise shutil.ReadError("%s is not a zip file" % filename) + raise shutil.ReadError("{} is not a zip file".format(filename)) diff --git a/gns3server/db/models/base.py b/gns3server/db/models/base.py index 4984b8773..5a185a437 100644 --- a/gns3server/db/models/base.py +++ b/gns3server/db/models/base.py @@ -59,10 +59,10 @@ class GUID(TypeDecorator): return str(value) else: if not isinstance(value, uuid.UUID): - return "%.32x" % uuid.UUID(value).int + return "{:032x}".format(uuid.UUID(value).int) else: # hexstring - return "%.32x" % value.int + return "{:032x}".format(value.int) def process_result_value(self, value, dialect): if value is None: diff --git a/gns3server/utils/__init__.py b/gns3server/utils/__init__.py index c1e485692..2b57ec8ae 100644 --- a/gns3server/utils/__init__.py +++ b/gns3server/utils/__init__.py @@ -50,7 +50,7 @@ def int_to_macaddress(integer): """ Convert an integer to a mac address """ - return ":".join(textwrap.wrap("%012x" % (integer), width=2)) + return ":".join(textwrap.wrap("{:012x}".format(integer), width=2)) def parse_version(version): diff --git a/gns3server/utils/asyncio/aiozipstream.py b/gns3server/utils/asyncio/aiozipstream.py index 1efafc37e..2ea16f83a 100644 --- a/gns3server/utils/asyncio/aiozipstream.py +++ b/gns3server/utils/asyncio/aiozipstream.py @@ -183,7 +183,7 @@ class ZipFile(zipfile.ZipFile): """ if not isinstance(comment, bytes): - raise TypeError("comment: expected bytes, got %s" % type(comment)) + raise TypeError("comment: expected bytes, got {}".format(type(comment))) # check for valid comment length if len(comment) >= zipfile.ZIP_MAX_COMMENT: if self.debug: