diff options
| author | Kyr Shatskyy <kyrylo.shatskyy@suse.com> | 2019-10-11 17:57:47 +0200 |
|---|---|---|
| committer | Kyr Shatskyy <kyrylo.shatskyy@suse.com> | 2019-10-11 18:54:29 +0200 |
| commit | 5f95b532aa26249cecea4586166399a0bf10ad47 (patch) | |
| tree | 0f9949d9265d750fce9ce5394959b22e5eac29f6 /qa/tasks/util | |
| parent | Merge PR #30734 into master (diff) | |
| download | ceph-5f95b532aa26249cecea4586166399a0bf10ad47.tar.xz ceph-5f95b532aa26249cecea4586166399a0bf10ad47.zip | |
qa: get rid of iterkeys for py3 compatibility
Fixes: https://tracker.ceph.com/issues/42287
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Diffstat (limited to 'qa/tasks/util')
| -rw-r--r-- | qa/tasks/util/rgw.py | 2 | ||||
| -rw-r--r-- | qa/tasks/util/workunit.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qa/tasks/util/rgw.py b/qa/tasks/util/rgw.py index ee79208cc5b..d3abf1ced3b 100644 --- a/qa/tasks/util/rgw.py +++ b/qa/tasks/util/rgw.py @@ -31,7 +31,7 @@ def rgwadmin(ctx, client, cmd, stdin=StringIO(), check_status=False, ] pre.extend(cmd) log.log(log_level, 'rgwadmin: cmd=%s' % pre) - (remote,) = ctx.cluster.only(client).remotes.iterkeys() + (remote,) = ctx.cluster.only(client).remotes.keys() proc = remote.run( args=pre, check_status=check_status, diff --git a/qa/tasks/util/workunit.py b/qa/tasks/util/workunit.py index c5314330ffb..91b0e0f8e19 100644 --- a/qa/tasks/util/workunit.py +++ b/qa/tasks/util/workunit.py @@ -63,8 +63,8 @@ def get_refspec_after_overrides(config, overrides): overrides = copy.deepcopy(overrides.get('workunit', {})) refspecs = {'suite_sha1': Refspec, 'suite_branch': Branch, 'sha1': Refspec, 'tag': Refspec, 'branch': Branch} - if any(map(lambda i: i in config, refspecs.iterkeys())): - for i in refspecs.iterkeys(): + if any(map(lambda i: i in config, refspecs.keys())): + for i in refspecs.keys(): overrides.pop(i, None) misc.deep_merge(config, overrides) |