From 807b53c71bc2e1e08e4b6e0f69bd348502cdc019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 6 Dec 2023 17:13:32 +0100
Subject: [PATCH] modernize code with ruff

---
 pkgs/clan-cli/clan_cli/backups/create.py  |  3 +--
 pkgs/clan-cli/clan_cli/backups/list.py    |  3 +--
 pkgs/clan-cli/clan_cli/backups/restore.py |  3 +--
 pkgs/clan-cli/clan_cli/clan_uri.py        | 16 ++++++----------
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/pkgs/clan-cli/clan_cli/backups/create.py b/pkgs/clan-cli/clan_cli/backups/create.py
index 5bbe5e8a..a1bfdaf3 100644
--- a/pkgs/clan-cli/clan_cli/backups/create.py
+++ b/pkgs/clan-cli/clan_cli/backups/create.py
@@ -1,13 +1,12 @@
 import argparse
 import json
 import subprocess
-from typing import Optional
 
 from ..errors import ClanError
 from ..machines.machines import Machine
 
 
-def create_backup(machine: Machine, provider: Optional[str] = None) -> None:
+def create_backup(machine: Machine, provider: str | None = None) -> None:
     backup_scripts = json.loads(
         machine.eval_nix(f"nixosConfigurations.{machine.name}.config.clanCore.backups")
     )
diff --git a/pkgs/clan-cli/clan_cli/backups/list.py b/pkgs/clan-cli/clan_cli/backups/list.py
index c7fe8457..471d3806 100644
--- a/pkgs/clan-cli/clan_cli/backups/list.py
+++ b/pkgs/clan-cli/clan_cli/backups/list.py
@@ -1,13 +1,12 @@
 import argparse
 import pprint
 from pathlib import Path
-from typing import Optional
 
 from ..errors import ClanError
 
 
 def list_backups(
-    flake_dir: Path, machine: str, provider: Optional[str] = None
+    flake_dir: Path, machine: str, provider: str | None = None
 ) -> dict[str, dict[str, list[dict[str, str]]]]:
     dummy_data = {
         "testhostname": {
diff --git a/pkgs/clan-cli/clan_cli/backups/restore.py b/pkgs/clan-cli/clan_cli/backups/restore.py
index 64102fc0..6769a01f 100644
--- a/pkgs/clan-cli/clan_cli/backups/restore.py
+++ b/pkgs/clan-cli/clan_cli/backups/restore.py
@@ -1,6 +1,5 @@
 import argparse
 from pathlib import Path
-from typing import Optional
 
 from ..errors import ClanError
 
@@ -10,7 +9,7 @@ def restore_backup(
     machine: str,
     provider: str,
     backup_id: str,
-    service: Optional[str] = None,
+    service: str | None = None,
 ) -> None:
     if service is None:
         print("would restore backup", machine, provider, backup_id)
diff --git a/pkgs/clan-cli/clan_cli/clan_uri.py b/pkgs/clan-cli/clan_cli/clan_uri.py
index cca37d77..25a3ab2c 100644
--- a/pkgs/clan-cli/clan_cli/clan_uri.py
+++ b/pkgs/clan-cli/clan_cli/clan_uri.py
@@ -4,7 +4,7 @@ import urllib.parse
 from dataclasses import dataclass
 from enum import Enum, member
 from pathlib import Path
-from typing import Dict, Self
+from typing import Self
 
 from .errors import ClanError
 
@@ -52,7 +52,7 @@ class ClanURI:
         if uri.startswith("clan://"):
             self._nested_uri = uri[7:]
         else:
-            raise ClanError("Invalid scheme: expected clan://, got {}".format(uri))
+            raise ClanError(f"Invalid scheme: expected clan://, got {uri}")
 
         # Parse the URI into components
         # scheme://netloc/path;parameters?query#fragment
@@ -61,14 +61,12 @@ class ClanURI:
         # Parse the query string into a dictionary
         query = urllib.parse.parse_qs(self._components.query)
 
-        params: Dict[str, str] = {}
+        params: dict[str, str] = {}
         for field in dataclasses.fields(ClanParameters):
             if field.name in query:
                 values = query[field.name]
                 if len(values) > 1:
-                    raise ClanError(
-                        "Multiple values for parameter: {}".format(field.name)
-                    )
+                    raise ClanError(f"Multiple values for parameter: {field.name}")
                 params[field.name] = values[0]
 
                 # Remove the field from the query dictionary
@@ -89,12 +87,10 @@ class ClanURI:
             case "file":
                 self.scheme = ClanScheme.FILE.value(Path(self._components.path))  # type: ignore
             case _:
-                raise ClanError(
-                    "Unsupported scheme: {}".format(self._components.scheme)
-                )
+                raise ClanError(f"Unsupported scheme: {self._components.scheme}")
 
     @classmethod
     def from_path(cls, path: Path, params: ClanParameters) -> Self:  # noqa
         urlparams = urllib.parse.urlencode(params.__dict__)
 
-        return cls("clan://file://{}?{}".format(path, urlparams))
+        return cls(f"clan://file://{path}?{urlparams}")