Fix Code based on ruff 0.3->0.8.1

Fix errors for tyope annotation for list, dict, type and tuple

Example:
UP006: Use `list` instead of `List` for type annotation

Signed-off-by: Nicola Sella <nsella@redhat.com>

Author: inknos

podman/domain/containers_create.py

@@ -247,6 +247,7 @@ def create(
                 in case of read_only options set to True. Default: False
             remove (bool): Remove the container when it has finished running. Default: False.
             restart_policy (dict[str, Union[str, int]]): Restart the container when it exits.
+
                 Configured as a dictionary with keys:
 
                 - Name: One of on-failure, or always.

podman/domain/images_manager.py

@@ -6,7 +6,11 @@
 import logging
 import os
 import urllib.parse
+<<<<<<< HEAD
 from typing import Any, Literal, Optional, Union
+=======
+from typing import Any, Optional, Union
+>>>>>>> fa8eb3e (Fix Code based on ruff 0.3->0.8.1)
 from collections.abc import Iterator, Mapping, Generator
 from pathlib import Path
 import requests
@@ -49,7 +53,11 @@ def exists(self, key: str) -> bool:
         response = self.client.get(f"/images/{key}/exists")
         return response.ok
 
+<<<<<<< HEAD
     def list(self, **kwargs) -> builtins.list[Image]:
+=======
+    def list(self, **kwargs) -> list[Image]:
+>>>>>>> fa8eb3e (Fix Code based on ruff 0.3->0.8.1)
         """Report on images.
 
         Keyword Args:
@@ -203,8 +211,13 @@ def prune(
         response = self.client.post("/images/prune", params=params)
         response.raise_for_status()
 
+<<<<<<< HEAD
         deleted: builtins.list[dict[str, str]] = []
         error: builtins.list[str] = []
+=======
+        deleted: list[dict[str, str]] = []
+        error: list[str] = []
+>>>>>>> fa8eb3e (Fix Code based on ruff 0.3->0.8.1)
         reclaimed: int = 0
         # If the prune doesn't remove images, the API returns "null"
         # and it's interpreted as None (NoneType)
@@ -302,7 +315,11 @@ def push(
 
     @staticmethod
     def _push_helper(
+<<<<<<< HEAD
         decode: bool, body: builtins.list[dict[str, Any]]
+=======
+        decode: bool, body: list[dict[str, Any]]
+>>>>>>> fa8eb3e (Fix Code based on ruff 0.3->0.8.1)
     ) -> Iterator[Union[str, dict[str, Any]]]:
         """Helper needed to allow push() to return either a generator or a str."""
         for entry in body:
@@ -318,7 +335,11 @@ def pull(
         tag: Optional[str] = None,
         all_tags: bool = False,
         **kwargs,
+<<<<<<< HEAD
     ) -> Union[Image, builtins.list[Image], Iterator[str]]:
+=======
+    ) -> Union[Image, list[Image], Iterator[str]]:
+>>>>>>> fa8eb3e (Fix Code based on ruff 0.3->0.8.1)
         """Request Podman service to pull image(s) from repository.
 
         Args:
@@ -423,7 +444,11 @@ def pull(
         for item in reversed(list(response.iter_lines())):
             obj = json.loads(item)
             if all_tags and "images" in obj:
+<<<<<<< HEAD
                 images: builtins.list[Image] = []
+=======
+                images: list[Image] = []
+>>>>>>> fa8eb3e (Fix Code based on ruff 0.3->0.8.1)
                 for name in obj["images"]:
                     images.append(self.get(name))
                 return images
@@ -468,7 +493,11 @@ def remove(
         image: Union[Image, str],
         force: Optional[bool] = None,
         noprune: bool = False,  # pylint: disable=unused-argument
+<<<<<<< HEAD
     ) -> builtins.list[dict[Literal["Deleted", "Untagged", "Errors", "ExitCode"], Union[str, int]]]:
+=======
+    ) -> list[dict[Literal["Deleted", "Untagged", "Errors", "ExitCode"], Union[str, int]]]:
+>>>>>>> fa8eb3e (Fix Code based on ruff 0.3->0.8.1)
         """Delete image from Podman service.
 
         Args:
@@ -487,15 +516,23 @@ def remove(
         response.raise_for_status(not_found=ImageNotFound)
 
         body = response.json()
+<<<<<<< HEAD
         results: builtins.list[dict[str, Union[int, str]]] = []
+=======
+        results: list[dict[str, Union[int, str]]] = []
+>>>>>>> fa8eb3e (Fix Code based on ruff 0.3->0.8.1)
         for key in ("Deleted", "Untagged", "Errors"):
             if key in body:
                 for element in body[key]:
                     results.append({key: element})
         results.append({"ExitCode": body["ExitCode"]})
         return results
 
+<<<<<<< HEAD
     def search(self, term: str, **kwargs) -> builtins.list[dict[str, Any]]:
+=======
+    def search(self, term: str, **kwargs) -> list[dict[str, Any]]:
+>>>>>>> fa8eb3e (Fix Code based on ruff 0.3->0.8.1)
         """Search Images on registries.
 
         Args:

podman/domain/pods_manager.py

@@ -101,6 +101,7 @@ def prune(self, filters: Optional[dict[str, str]] = None) -> dict[str, Any]:
         response.raise_for_status()
 
         deleted: builtins.list[str] = []
+
         for item in response.json():
             if item["Err"] is not None:
                 raise APIError(
@@ -132,7 +133,7 @@ def remove(self, pod_id: Union[Pod, str], force: Optional[bool] = None) -> None:
         response.raise_for_status()
 
     def stats(
-        self, **kwargs
+    self, **kwargs
     ) -> Union[builtins.list[dict[str, Any]], Iterator[builtins.list[dict[str, Any]]]]:
         """Resource usage statistics for the containers in pods.
 

podman/errors/exceptions.py

@@ -1,6 +1,10 @@
 """Podman API Errors."""
 
+<<<<<<< HEAD
 from typing import List, Dict, Optional, Union, TYPE_CHECKING
+=======
+from typing import Optional, Union, TYPE_CHECKING
+>>>>>>> fa8eb3e (Fix Code based on ruff 0.3->0.8.1)
 from collections.abc import Iterable
 
 from requests import Response
@@ -143,7 +147,7 @@ def __init__(
 
 class InvalidArgument(PodmanError):
     """Parameter to method/function was not valid."""
-    
+
 
 class PodmanConnectionError(PodmanError):
     """Exception raised when connection to Podman service fails using environment configuration."""