projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 f5e67a6649409c60c6deddef9431340e7504e96c..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 (
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)
):
try:
match = re.match(r"^([^ ]+)\s+([^ ]+)\s+([^ ]+)", line)