From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 22 Oct 2019 04:22:00 +0000 (-0700)
Subject: Merge PR #30813 into master
X-Git-Tag: v15.1.0~1204
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3c4328c0a486118480ca9e39e071c862beaf4ea0;p=ceph.git

Merge PR #30813 into master

* 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>
---

3c4328c0a486118480ca9e39e071c862beaf4ea0
diff --cc qa/workunits/mon/caps.py
index 2af2f28a0215,270cf791b321..7185a96453e1
--- a/qa/workunits/mon/caps.py
+++ b/qa/workunits/mon/caps.py
@@@ -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,