import 15.2.0 Octopus source

[ceph.git] / ceph / qa / tasks / util / workunit.py

diff --git a/ceph/qa/tasks/util/workunit.py b/ceph/qa/tasks/util/workunit.py
index c5314330ffbfe4df1a1c4bf9b70336232a6595a9..1f5623af8a1c43b151950901d63bae4c714f9a3d 100644 (file)
--- a/ceph/qa/tasks/util/workunit.py
+++ b/ceph/qa/tasks/util/workunit.py
@@ -63,12 +63,12 @@ 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)
 
-    for spec, cls in refspecs.iteritems():
+    for spec, cls in refspecs.items():
         refspec = config.get(spec)
         if refspec:
             refspec = cls(refspec)