]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
report: do not use 'basestring' for py3
authorKyr Shatskyy <kyrylo.shatskyy@suse.com>
Mon, 18 Nov 2019 21:49:34 +0000 (22:49 +0100)
committerKyr Shatskyy <kyrylo.shatskyy@gmail.com>
Thu, 21 Nov 2019 21:16:10 +0000 (22:16 +0100)
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
teuthology/report.py

index ab0430ee19fbfae9ad54c23d1a77edee438e0e47..7b23e7d8e5afc6e548539e274af3e60841d2630d 100644 (file)
@@ -157,7 +157,7 @@ class ResultsSerializer(object):
         :returns:        A dict like: {'1': '/path/to/1', '2': 'path/to/2'}
         """
         jobs = self.jobs_for_run(run_name)
-        for job_id in jobs.keys():
+        for job_id in list(jobs):
             if os.path.exists(os.path.join(jobs[job_id], 'summary.yaml')):
                 jobs.pop(job_id)
         return jobs
@@ -513,10 +513,13 @@ def try_delete_jobs(run_name, job_ids, delete_empty_run=True):
     """
     log = init_logging()
 
-    if isinstance(job_ids, int):
-        job_ids = [str(job_ids)]
-    elif isinstance(job_ids, basestring):
-        job_ids = [job_ids]
+    if not isinstance(job_ids, list):
+        if isinstance(job_ids, int):
+            job_ids = [str(job_ids)]
+        elif isinstance(job_ids, bytes):
+            job_ids = [str(job_ids.decode())]
+        else:
+            job_ids = [job_ids]
 
     reporter = ResultsReporter()
     if not reporter.base_uri: