Use pyupgrade with --py36-plus param.

gns3server/api/routes/compute/atm_switch_nodes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/compute/capabilities.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/compute/cloud_nodes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/compute/compute.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/compute/docker_nodes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/compute/dynamips_nodes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #
@@ -226,7 +225,7 @@ async def start_capture(adapter_number: int,
         try:
             pcap_file_path.encode('ascii')
         except UnicodeEncodeError:
-            raise DynamipsError('The capture file path "{}" must only contain ASCII (English) characters'.format(pcap_file_path))
+            raise DynamipsError(f"The capture file path '{pcap_file_path}' must only contain ASCII (English) characters")
 
     await node.start_capture(adapter_number, port_number, pcap_file_path, node_capture_data.data_link_type)
     return {"pcap_file_path": pcap_file_path}

gns3server/api/routes/compute/ethernet_hub_nodes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/compute/ethernet_switch_nodes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/compute/frame_relay_switch_nodes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/compute/images.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/compute/iou_nodes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/compute/nat_nodes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/compute/notifications.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #
@@ -46,7 +45,7 @@ async def notification_ws(websocket: WebSocket):
     except (ConnectionClosed, WebSocketDisconnect):
         log.info(f"Client {websocket.client.host}:{websocket.client.port} has disconnected from compute WebSocket")
     except WebSocketException as e:
-        log.warning("Error while sending to controller event to WebSocket client: '{}'".format(e))
+        log.warning(f"Error while sending to controller event to WebSocket client: {e}")
     finally:
         await websocket.close()
 

gns3server/api/routes/compute/projects.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2015 GNS3 Technologies Inc.
 #

gns3server/api/routes/compute/qemu_nodes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/compute/virtualbox_nodes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/compute/vmware_nodes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/compute/vpcs_nodes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/controller/appliances.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/controller/computes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/controller/controller.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2015 GNS3 Technologies Inc.
 #
@@ -61,7 +60,7 @@ async def shutdown():
             try:
                 future.result()
             except Exception as e:
-                log.error("Could not close project {}".format(e), exc_info=1)
+                log.error(f"Could not close project: {e}", exc_info=1)
                 continue
 
     # then shutdown the server itself
@@ -94,7 +93,7 @@ def check_version(version: schemas.Version):
 
     print(version.version)
     if version.version != __version__:
-        raise ControllerError("Client version {} is not the same as server version {}".format(version.version, __version__))
+        raise ControllerError(f"Client version {version.version} is not the same as server version {__version__}")
     return {"version": __version__}
 
 
@@ -135,7 +134,7 @@ async def statistics():
             r = await compute.get("/statistics")
             compute_statistics.append({"compute_id": compute.id, "compute_name": compute.name, "statistics": r.json})
         except ControllerError as e:
-            log.error("Could not retrieve statistics on compute {}: {}".format(compute.name, e))
+            log.error(f"Could not retrieve statistics on compute {compute.name}: {e}")
     return compute_statistics
 
 # @Route.post(

gns3server/api/routes/controller/dependencies/authentication.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/controller/dependencies/database.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/controller/drawings.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #

gns3server/api/routes/controller/links.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2016 GNS3 Technologies Inc.
 #

gns3server/api/routes/controller/nodes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #
@@ -58,7 +57,7 @@ class NodeConcurrency(APIRoute):
             project_id = request.path_params.get("project_id")
 
             if node_id and "pcap" not in request.url.path and not request.url.path.endswith("console/ws"):
-                lock_key = "{}:{}".format(project_id, node_id)
+                lock_key = f"{project_id}:{node_id}"
                 node_locks.setdefault(lock_key, {"lock": asyncio.Lock(), "concurrency": 0})
                 node_locks[lock_key]["concurrency"] += 1
 
@@ -323,11 +322,9 @@ async def get_file(file_path: str, node: Node = Depends(dep_node)):
         raise ControllerForbiddenError("It is forbidden to get a file outside the project directory")
 
     node_type = node.node_type
-    path = "/project-files/{}/{}/{}".format(node_type, node.id, path)
+    path = f"/project-files/{node_type}/{node.id}/{path}"
 
-    res = await node.compute.http_query("GET", "/projects/{project_id}/files{path}".format(project_id=node.project.id, path=path),
-                                        timeout=None,
-                                        raw=True)
+    res = await node.compute.http_query("GET", f"/projects/{node.project.id}/files{path}", timeout=None, raw=True)
     return Response(res.body, media_type="application/octet-stream")
 
 
@@ -345,14 +342,11 @@ async def post_file(file_path: str, request: Request, node: Node = Depends(dep_n
         raise ControllerForbiddenError("Cannot write outside the node directory")
 
     node_type = node.node_type
-    path = "/project-files/{}/{}/{}".format(node_type, node.id, path)
+    path = f"/project-files/{node_type}/{node.id}/{path}"
 
     data = await request.body()  #FIXME: are we handling timeout or large files correctly?
 
-    await node.compute.http_query("POST", "/projects/{project_id}/files{path}".format(project_id=node.project.id, path=path),
-                                  data=data,
-                                  timeout=None,
-                                  raw=True)
+    await node.compute.http_query("POST", f"/projects/{node.project.id}/files{path}", data=data, timeout=None, raw=True)
 
 
 @router.websocket("/{node_id}/console/ws")

gns3server/api/routes/controller/notifications.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #
@@ -41,7 +40,7 @@ async def http_notification():
         with Controller.instance().notification.controller_queue() as queue:
             while True:
                 msg = await queue.get_json(5)
-                yield ("{}\n".format(msg)).encode("utf-8")
+                yield (f"{msg}\n").encode("utf-8")
 
     return StreamingResponse(event_stream(), media_type="application/json")
 
@@ -62,6 +61,6 @@ async def notification_ws(websocket: WebSocket):
     except (ConnectionClosed, WebSocketDisconnect):
         log.info(f"Client {websocket.client.host}:{websocket.client.port} has disconnected from controller WebSocket")
     except WebSocketException as e:
-        log.warning("Error while sending to controller event to WebSocket client: '{}'".format(e))
+        log.warning(f"Error while sending to controller event to WebSocket client: {e}")
     finally:
         await websocket.close()

gns3server/api/routes/controller/projects.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020 GNS3 Technologies Inc.
 #
@@ -180,7 +179,7 @@ async def load_project(path: str = Body(..., embed=True)):
     controller = Controller.instance()
     dot_gns3_file = path
     if Config.instance().settings.Server.local is False:
-        log.error("Cannot load '{}' because the server has not been started with the '--local' parameter".format(dot_gns3_file))
+        log.error(f"Cannot load '{dot_gns3_file}' because the server has not been started with the '--local' parameter")
         raise ControllerForbiddenError("Cannot load project when server is not local")
     project = await controller.load_project(dot_gns3_file,)
     return project.__json__()
@@ -195,7 +194,7 @@ async def notification(project_id: UUID):
     controller = Controller.instance()
     project = controller.get_project(str(project_id))
 
-    log.info("New client has connected to the notification stream for project ID '{}' (HTTP steam method)".format(project.id))
+    log.info(f"New client has connected to the notification stream for project ID '{project.id}' (HTTP steam method)")
 
     async def event_stream():
 
@@ -203,15 +202,15 @@ async def notification(project_id: UUID):
             with controller.notification.project_queue(project.id) as queue:
                 while True:
                     msg = await queue.get_json(5)
-                    yield ("{}\n".format(msg)).encode("utf-8")
+                    yield (f"{msg}\n").encode("utf-8")
         finally:
-            log.info("Client has disconnected from notification for project ID '{}' (HTTP stream method)".format(project.id))
+            log.info(f"Client has disconnected from notification for project ID '{project.id}' (HTTP stream method)")
             if project.auto_close:
                 # To avoid trouble with client connecting disconnecting we sleep few seconds before checking
                 # if someone else is not connected
                 await asyncio.sleep(5)
                 if not controller.notification.project_has_listeners(project.id):
-                    log.info("Project '{}' is automatically closing due to no client listening".format(project.id))
+                    log.info(f"Project '{project.id}' is automatically closing due to no client listening")
                     await project.close()
 
     return StreamingResponse(event_stream(), media_type="application/json")
@@ -227,16 +226,16 @@ async def notification_ws(project_id: UUID, websocket: WebSocket):
     project = controller.get_project(str(project_id))
     await websocket.accept()
 
-    log.info("New client has connected to the notification stream for project ID '{}' (WebSocket method)".format(project.id))
+    log.info(f"New client has connected to the notification stream for project ID '{project.id}' (WebSocket method)")
     try:
         with controller.notification.project_queue(project.id) as queue:
             while True:
                 notification = await queue.get_json(5)
                 await websocket.send_text(notification)
     except (ConnectionClosed, WebSocketDisconnect):
-        log.info("Client has disconnected from notification stream for project ID '{}' (WebSocket method)".format(project.id))
+        log.info(f"Client has disconnected from notification stream for project ID '{project.id}' (WebSocket method)")
     except WebSocketException as e:
-        log.warning("Error while sending to project event to WebSocket client: '{}'".format(e))
+        log.warning(f"Error while sending to project event to WebSocket client: {e}")
     finally:
         await websocket.close()
         if project.auto_close:
@@ -244,7 +243,7 @@ async def notification_ws(project_id: UUID, websocket: WebSocket):
             # if someone else is not connected
             await asyncio.sleep(5)
             if not controller.notification.project_has_listeners(project.id):
-                log.info("Project '{}' is automatically closing due to no client listening".format(project.id))
+                log.info(f"Project '{project.id}' is automatically closing due to no client listening")
                 await project.close()
 
 
@@ -285,14 +284,14 @@ async def export_project(project: Project = Depends(dep_project),
                     async for chunk in zstream:
                         yield chunk
 
-            log.info("Project '{}' exported in {:.4f} seconds".format(project.name, time.time() - begin))
+            log.info(f"Project '{project.name}' exported in {time.time() - begin:.4f} seconds")
 
     # Will be raise if you have no space left or permission issue on your temporary directory
     # RuntimeError: something was wrong during the zip process
     except (ValueError, OSError, RuntimeError) as e:
-        raise ConnectionError("Cannot export project: {}".format(e))
+        raise ConnectionError(f"Cannot export project: {e}")
 
-    headers = {"CONTENT-DISPOSITION": 'attachment; filename="{}.gns3project"'.format(project.name)}
+    headers = {"CONTENT-DISPOSITION": f'attachment; filename="{project.name}.gns3project"'}
     return StreamingResponse(streamer(), media_type="application/gns3project", headers=headers)
 
 
@@ -325,9 +324,9 @@ async def import_project(project_id: UUID, request: Request, path: Optional[Path
             with open(temp_project_path, "rb") as f:
                 project = await import_controller_project(controller, str(project_id), f, location=path, name=name)
 
-        log.info("Project '{}' imported in {:.4f} seconds".format(project.name, time.time() - begin))
+        log.info(f"Project '{project.name}' imported in {time.time() - begin:.4f} seconds")
     except OSError as e:
-        raise ControllerError("Could not import the project: {}".format(e))
+        raise ControllerError(f"Could not import the project: {e}")
     return project.__json__()
 
 

gns3server/api/routes/controller/symbols.py

@@ -54,7 +54,7 @@ async def get_symbol(symbol_id: str):
         symbol = controller.symbols.get_path(symbol_id)
         return FileResponse(symbol)
     except (KeyError, OSError) as e:
-        return ControllerNotFoundError("Could not get symbol file: {}".format(e))
+        return ControllerNotFoundError(f"Could not get symbol file: {e}")
 
 
 @router.get("/{symbol_id:path}/dimensions",
@@ -70,7 +70,7 @@ async def get_symbol_dimensions(symbol_id: str):
         symbol_dimensions = {'width': width, 'height': height}
         return symbol_dimensions
     except (KeyError, OSError, ValueError) as e:
-        return ControllerNotFoundError("Could not get symbol file: {}".format(e))
+        return ControllerNotFoundError(f"Could not get symbol file: {e}")
 
 
 @router.post("/{symbol_id:path}/raw",
@@ -87,7 +87,7 @@ async def upload_symbol(symbol_id: str, request: Request):
         with open(path, "wb") as f:
             f.write(await request.body())
     except (UnicodeEncodeError, OSError) as e:
-        raise ControllerError("Could not write symbol file '{}': {}".format(path, e))
+        raise ControllerError(f"Could not write symbol file '{path}': {e}")
 
     # Reset the symbol list
     controller.symbols.list()

gns3server/api/routes/controller/templates.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2021 GNS3 Technologies Inc.
 #

gns3server/api/server.py

@@ -153,5 +153,5 @@ async def add_extra_headers(request: Request, call_next):
     response = await call_next(request)
     process_time = time.time() - start_time
     response.headers["X-Process-Time"] = str(process_time)
-    response.headers["X-GNS3-Server-Version"] = "{}".format(__version__)
+    response.headers["X-GNS3-Server-Version"] = f"{__version__}"
     return response