Merge branch '3.1' into images-nested-folders-support

gns3server/utils/__init__.py

@@ -48,7 +48,7 @@ def int_to_macaddress(integer):
     """
     Convert an integer to a mac address
     """
-    return ":".join(textwrap.wrap("{:012x}".format(integer), width=2))
+    return ":".join(textwrap.wrap(f"{integer:012x}", width=2))
 
 
 def parse_version(version):

gns3server/utils/asyncio/aiozipstream.py

@@ -184,7 +184,7 @@ class ZipFile(zipfile.ZipFile):
         """
 
         if not isinstance(comment, bytes):
-            raise TypeError("comment: expected bytes, got {}".format(type(comment)))
+            raise TypeError(f"comment: expected bytes, got {type(comment)}")
         # check for valid comment length
         if len(comment) >= zipfile.ZIP_MAX_COMMENT:
             if self.debug:

gns3server/utils/images.py

@@ -77,7 +77,7 @@ async def list_images(image_type):
         for root, _, filenames in _os_walk(directory, recurse=recurse):
             for filename in filenames:
                 if filename in files:
-                    log.debug("File {} has already been found, skipping...".format(filename))
+                    log.debug(f"File {filename} has already been found, skipping...")
                     continue
                 if filename.endswith(".md5sum") or filename.startswith("."):
                     continue

gns3server/utils/interfaces.py

@@ -66,7 +66,7 @@ def _get_windows_interfaces_from_registry():
                 if ip_address:
                     # get the first IPv4 address only
                     ip_address = ip_address[0]
-            npf_interface = "\\Device\\NPF_{guid}".format(guid=guid)
+            npf_interface = f"\\Device\\NPF_{guid}"
             interfaces.append(
                 {
                     "id": npf_interface,
@@ -116,7 +116,7 @@ def get_windows_interfaces():
                             ip_address = network_config.IPAddress[0]
                             netmask = network_config.IPSubnet[0]
                         break
-                npf_interface = "\\Device\\NPF_{guid}".format(guid=adapter.GUID)
+                npf_interface = f"\\Device\\NPF_{adapter.GUID}"
                 interfaces.append(
                     {
                         "id": npf_interface,