chore: remove merge conflicts

Signed-off-by: Kanishk Pachauri <[email protected]>

Author: Mr-Sunglasses

podman/domain/containers_create.py

@@ -247,7 +247,6 @@ 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.
@@ -774,4 +773,4 @@ def parse_host_port(_container_port, _protocol, _host):
                 "Unknown keyword argument(s): " + " ,".join(f"'{k}'" for k in args.keys())
             )
 
-        return params
+        return params

podman/domain/images_manager.py

@@ -6,11 +6,7 @@
 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
@@ -53,11 +49,7 @@ 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:
@@ -211,13 +203,8 @@ 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)
@@ -315,11 +302,7 @@ 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:
@@ -335,11 +318,7 @@ 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:
@@ -351,11 +330,8 @@ def pull(
             auth_config (Mapping[str, str]) – Override the credentials that are found in the
                 config for this request. auth_config should contain the username and password
                 keys to be valid.
-<<<<<<< HEAD
             compatMode (bool) – Return the same JSON payload as the Docker-compat endpoint.
                 Default: True.
-=======
->>>>>>> b8f28e2 (Implement "decode" parameter in pull())
             decode (bool) – Decode the JSON data from the server into dicts.
                 Only applies with ``stream=True``
             platform (str) – Platform in the format os[/arch[/variant]]
@@ -444,11 +420,7 @@ 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
@@ -493,11 +465,7 @@ 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:
@@ -516,23 +484,15 @@ 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:
@@ -612,4 +572,4 @@ def _stream_helper(self, response, decode=False):
         else:
             # Response isn't chunked, meaning we probably
             # encountered an error immediately
-            yield self._result(response, json=decode)
+            yield self._result(response, json=decode)

podman/domain/json_stream.py

@@ -14,9 +14,10 @@ def stream_as_text(stream):
     instead of byte streams.
     """
     for data in stream:
+        _data = data
         if not isinstance(data, str):
-            data = data.decode('utf-8', 'replace')
-        yield data
+            _data = data.decode('utf-8', 'replace')
+        yield _data
 
 
 def json_splitter(buffer):
@@ -71,4 +72,4 @@ def split_buffer(stream, splitter=None, decoder=lambda a: a):
         try:
             yield decoder(buffered)
         except Exception as e:
-            raise StreamParseError(e) from e
+            raise StreamParseError(e) from e

podman/domain/pods_manager.py

@@ -101,7 +101,6 @@ 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(
@@ -133,7 +132,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.
 
@@ -166,4 +165,4 @@ def stats(
         if stream:
             return api.stream_helper(response, decode_to_json=decode)
 
-        return json.loads(response.content) if decode else response.content
+        return json.loads(response.content) if decode else response.content