21718: Replace .decode method with str(bytes, "utf-8")

[arvados.git] / sdk / cwl / arvados_cwl / arvdocker.py

diff --git a/sdk/cwl/arvados_cwl/arvdocker.py b/sdk/cwl/arvados_cwl/arvdocker.py
index 9c20c0c5095a04b27cfd92f9bf79bfb3324824d5..ae5a434074ad58d9c5710f70f5140597f8f17d2d 100644 (file)
--- a/sdk/cwl/arvados_cwl/arvdocker.py
+++ b/sdk/cwl/arvados_cwl/arvdocker.py
@@ -19,11 +19,10 @@ logger = logging.getLogger('arvados.cwl-runner')
 
 def determine_image_id(dockerImageId):
     for line in (
-        subprocess.check_output(  # nosec
-            ["docker", "images", "--no-trunc", "--all"]
-        )
-        .decode("utf-8")
-        .splitlines()
+            str(subprocess.check_output(  # nosec
+                ["docker", "images", "--no-trunc", "--all"]
+            ), "utf-8")
+            .splitlines()
     ):
         try:
             match = re.match(r"^([^ ]+)\s+([^ ]+)\s+([^ ]+)", line)
@@ -56,10 +55,10 @@ def determine_image_id(dockerImageId):
 def arv_docker_get_image(api_client, dockerRequirement, pull_image, runtimeContext):
     """Check if a Docker image is available in Keep, if not, upload it using arv-keepdocker."""
 
-    project_uuid = runtimeContext.project_uuid,
-    force_pull = runtimeContext.force_docker_pull,
-    tmp_outdir_prefix = runtimeContext.tmp_outdir_prefix,
-    match_local_docker = runtimeContext.match_local_docker,
+    project_uuid = runtimeContext.project_uuid
+    force_pull = runtimeContext.force_docker_pull
+    tmp_outdir_prefix = runtimeContext.tmp_outdir_prefix
+    match_local_docker = runtimeContext.match_local_docker
     copy_deps = runtimeContext.copy_deps
     cached_lookups = runtimeContext.cached_docker_lookups