Implement "decode" parameter in pull()

Implement `decode (bool)` parameter in `pull()`. Decode the JSON data from the server into dicts. Only applies with `stream=True`.

Signed-off-by: Antonio <vozaanthony@gmail.com>

Author: D3vil0p3r

podman/domain/images_manager.py

@@ -172,11 +172,7 @@ def prune(
         all: Optional[bool] = False,  # pylint: disable=redefined-builtin
         external: Optional[bool] = False,
         filters: Optional[Mapping[str, Any]] = None,
-<<<<<<< HEAD
     ) -> dict[Literal["ImagesDeleted", "SpaceReclaimed"], Any]:
-=======
-    ) -> Dict[Literal["ImagesDeleted", "SpaceReclaimed"], Any]:
->>>>>>> cec6b18 (Add all, external, and label to Image.prune())
         """Delete unused images.
 
         The Untagged keys will always be "".
@@ -334,8 +330,11 @@ 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]]

podman/domain/json_stream.py

@@ -14,10 +14,9 @@ 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):

podman/errors/exceptions.py

@@ -143,7 +143,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."""
@@ -201,6 +201,7 @@ def __str__(self) -> str:
 
 
 class StreamParseError(RuntimeError):
+<<<<<<< HEAD
     """Exception raised when parsing a stream fails."""
 
     def __init__(self, reason: str):
@@ -210,4 +211,7 @@ def __init__(self, reason: str):
             reason: Description of the parsing error.
         """
         super().__init__(reason)
+=======
+    def __init__(self, reason):
+>>>>>>> b8f28e2 (Implement "decode" parameter in pull())
         self.msg = reason