13306: Fixed test_submit.TestCreateTemplate encoding

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

diff --git a/sdk/cwl/arvados_cwl/done.py b/sdk/cwl/arvados_cwl/done.py
index 25efade2ab21900dd49dc16978fc9daac536efed..9c9195a6ab6f68d5d335153a1b7473bcac2a93cb 100644 (file)
--- a/sdk/cwl/arvados_cwl/done.py
+++ b/sdk/cwl/arvados_cwl/done.py
@@ -57,14 +57,13 @@ timestamp_re = re.compile(r"^(\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d\.\d+Z) (.*)")
 
 def logtail(logcollection, logfunc, header, maxlen=25):
     if len(logcollection) == 0:
-        logfunc(header)
-        logfunc("  ** log is empty **")
+        logfunc("%s\n%s", header, "  ** log is empty **")
         return
 
     containersapi = ("crunch-run.txt" in logcollection)
     mergelogs = {}
 
-    for log in logcollection.keys():
+    for log in list(logcollection.keys()):
         if not containersapi or log in ("crunch-run.txt", "stdout.txt", "stderr.txt"):
             logname = log[:-4]
             logt = deque([], maxlen)
@@ -78,7 +77,7 @@ def logtail(logcollection, logfunc, header, maxlen=25):
                         logt.append(l)
 
     if containersapi:
-        keys = mergelogs.keys()
+        keys = list(mergelogs.keys())
         loglines = []
         while True:
             earliest = None
@@ -92,8 +91,7 @@ def logtail(logcollection, logfunc, header, maxlen=25):
             loglines.append("%s %s %s" % (ts, earliest, msg))
         loglines = loglines[-maxlen:]
     else:
-        loglines = mergelogs.values()[0]
+        loglines = list(mergelogs.values())[0]
 
     logtxt = "\n  ".join(l.strip() for l in loglines)
-    logfunc(header)
-    logfunc("\n  %s", logtxt)
+    logfunc("%s\n\n  %s", header, logtxt)