refactor: ruff autofixes

gns3server/controller/appliance_manager.py

@@ -15,7 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import asyncio
 import copy
 import json
 import logging
@@ -221,7 +220,7 @@ class ApplianceManager:
             raise ControllerError(f"Could not save {image_type} image '{image_path}': {e}")
         except ClientError as e:
             raise ControllerError(f"Could not connect to download '{image_name}': {e}")
-        except asyncio.TimeoutError:
+        except TimeoutError:
             raise ControllerError(f"Timeout while downloading '{image_name}' from '{image_url}'")
 
     async def _find_appliance_version_images(
@@ -551,7 +550,7 @@ class ApplianceManager:
                     log.info(f"Saving {symbol} symbol to {destination_path}")
                     with open(destination_path, "wb") as f:
                         f.write(symbol_data)
-                except asyncio.TimeoutError:
+                except TimeoutError:
                     log.warning(f"Timeout while downloading '{symbol_url}'")
                 except OSError as e:
                     log.warning(f"Could not write appliance symbol '{destination_path}': {e}")
@@ -601,7 +600,7 @@ class ApplianceManager:
                             continue
                         try:
                             appliance_data = await response.read()
-                        except asyncio.TimeoutError:
+                        except TimeoutError:
                             log.warning("Timeout while downloading '{}'".format(appliance["download_url"]))
                             continue
                         path = os.path.join(appliances_dir, appliance_name)

gns3server/controller/compute.py

@@ -635,7 +635,7 @@ class Compute:
                 chunked=chunked,
                 timeout=timeout,
             )
-        except asyncio.TimeoutError:
+        except TimeoutError:
             raise ComputeError(f"Timeout error for {method} call to {url} after {timeout}s")
         except (
             aiohttp.ClientError,

gns3server/controller/export_project.py

@@ -15,7 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import asyncio
 import json
 import logging
 import os
@@ -134,7 +133,7 @@ async def export_project(
                         while True:
                             try:
                                 data = await response.content.read(CHUNK_SIZE)
-                            except asyncio.TimeoutError:
+                            except TimeoutError:
                                 raise ControllerTimeoutError(
                                     "Timeout when downloading file '{}' from remote compute {}:{}".format(
                                         compute_file["path"], compute.host, compute.port
@@ -326,7 +325,7 @@ async def _export_remote_images(project, compute_id, image_type, image, project_
         while True:
             try:
                 data = await response.content.read(CHUNK_SIZE)
-            except asyncio.TimeoutError:
+            except TimeoutError:
                 raise ControllerTimeoutError(
                     f"Timeout when downloading image '{image}' from remote compute {compute.host}:{compute.port}"
                 )

gns3server/controller/gns3vm/virtualbox_gns3_vm.py

@@ -434,7 +434,7 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
                                             return interface["ip_address"]
                         except ValueError:
                             pass
-            except (OSError, aiohttp.ClientError, TimeoutError, asyncio.TimeoutError):
+            except (OSError, aiohttp.ClientError, TimeoutError):
                 pass
             remaining_try -= 1
             await asyncio.sleep(1)

gns3server/controller/marker_replay.py

@@ -349,7 +349,7 @@ class _SharkdSession:
                 self.proc.stdin.write((json.dumps(request) + "\n").encode())
                 await self.proc.stdin.drain()
                 raw = await asyncio.wait_for(self.proc.stdout.readline(), RPC_TIMEOUT_SECONDS)
-            except asyncio.TimeoutError:
+            except TimeoutError:
                 await self._abort(f"sharkd timed out after {RPC_TIMEOUT_SECONDS:.0f}s on {method!r}")
             except (OSError, ValueError) as e:
                 # ValueError: a reply line over the StreamReader limit — the
@@ -387,7 +387,7 @@ class _SharkdSession:
                 # the caller — leak the process with a log instead.
                 try:
                     await asyncio.wait_for(self.proc.wait(), timeout=2.0)
-                except asyncio.TimeoutError:
+                except TimeoutError:
                     log.warning("sharkd session for %s did not exit after kill", self.pcap)
         except ProcessLookupError:
             pass

gns3server/controller/node.py

@@ -965,7 +965,7 @@ class Node:
                 )
             else:
                 await self.post("/start", data=data, timeout=240)
-        except asyncio.TimeoutError:
+        except TimeoutError:
             raise ControllerTimeoutError(f"Timeout when starting {self._name}")
         self._confirm_status("started")
         # A started node may have brought kernel anchors into existence that
@@ -990,7 +990,7 @@ class Node:
             # We don't care if a node is down at this step
             if strict:
                 raise
-        except asyncio.TimeoutError:
+        except TimeoutError:
             raise ControllerTimeoutError(f"Timeout when stopping {self._name}")
         if stopped:
             self._confirm_status("stopped")
@@ -1015,7 +1015,7 @@ class Node:
         """
         try:
             await self.post("/suspend", timeout=240)
-        except asyncio.TimeoutError:
+        except TimeoutError:
             raise ControllerTimeoutError(f"Timeout when suspending {self._name}")
         self._confirm_status("suspended")
 
@@ -1025,7 +1025,7 @@ class Node:
         """
         try:
             await self.post("/reload", timeout=240)
-        except asyncio.TimeoutError:
+        except TimeoutError:
             raise ControllerTimeoutError(f"Timeout when reloading {self._name}")
         self._confirm_status("started")
 
@@ -1037,7 +1037,7 @@ class Node:
         if self._console and self._console_type in ("telnet", "ssh"):
             try:
                 await self.post("/console/reset", timeout=240)
-            except asyncio.TimeoutError:
+            except TimeoutError:
                 raise ControllerTimeoutError(f"Timeout when reset console {self._name}")
 
     async def get(self, path="", **kwargs):

gns3server/controller/snapshot.py

@@ -23,7 +23,7 @@ import tempfile
 import time
 import uuid
 import zipfile
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 import aiofiles
 
@@ -63,19 +63,19 @@ class Snapshot:
             if created_at:
                 self._created_at = created_at
             else:
-                self._created_at = int(datetime.now(timezone.utc).timestamp())
+                self._created_at = int(datetime.now(UTC).timestamp())
             if not filename:
                 filename = self._name + ".gns3snapshot"
         else:
             self._name = filename.rsplit("_", 2)[0]
             datestring = filename.replace(self._name + "_", "").split(".")[0]
             self._created_at = int(
-                datetime.strptime(datestring, FILENAME_DATETIME_FORMAT).replace(tzinfo=timezone.utc).timestamp()
+                datetime.strptime(datestring, FILENAME_DATETIME_FORMAT).replace(tzinfo=UTC).timestamp()
             )
 
         if not description:
             date = (
-                datetime.fromtimestamp(self._created_at, tz=timezone.utc)
+                datetime.fromtimestamp(self._created_at, tz=UTC)
                 .replace(tzinfo=None)
                 .strftime(DESCRIPTION_DATETIME_FORMAT)
             )