]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #30813 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 22 Oct 2019 04:22:00 +0000 (21:22 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 22 Oct 2019 04:22:00 +0000 (21:22 -0700)
* refs/pull/30813/head:
qa: get rid of iteritems for python3 compatibility

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
qa/tasks/barbican.py
qa/tasks/ceph_manager.py
qa/tasks/cephfs/test_forward_scrub.py
qa/tasks/rgw.py
qa/workunits/mon/caps.py

Simple merge
Simple merge
Simple merge
diff --cc qa/tasks/rgw.py
Simple merge
index 2af2f28a0215f842dbb8c522bf24d83459ca05d2,270cf791b3213cae45ddf96ef0108e61b392d4a3..7185a96453e1b1d3f73d94958124c4f2ec1724f4
@@@ -283,10 -281,10 +283,10 @@@ def test_all()
        if len(cmd_args) > 0:
          (cmd_args_key, cmd_args_val) = cmd_args.split('=')
  
 -      print 'generating keyring for {m}/{c}'.format(m=module,c=cmd_cmd)
 +      print('generating keyring for {m}/{c}'.format(m=module,c=cmd_cmd))
        # gen keyring
-       for (good_or_bad,kind_map) in perms.iteritems():
-         for (kind,lst) in kind_map.iteritems():
+       for (good_or_bad,kind_map) in perms.items():
+         for (kind,lst) in kind_map.items():
            for (perm, cap) in lst:
              cap_formatted = cap.format(
                  s=module,