From 1f6f973bf5d29efba627a38cb8793f5f73f9b591 Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Mon, 18 Nov 2019 22:49:34 +0100 Subject: [PATCH] report: do not use 'basestring' for py3 Signed-off-by: Kyr Shatskyy --- teuthology/report.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/teuthology/report.py b/teuthology/report.py index ab0430ee19..7b23e7d8e5 100644 --- a/teuthology/report.py +++ b/teuthology/report.py @@ -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: -- 2.39.5