]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr: replace iteritems with six.iteritems (mgr_module.py) 22917/head
authorNathan Cutler <ncutler@suse.com>
Thu, 5 Jul 2018 15:34:51 +0000 (17:34 +0200)
committerNathan Cutler <ncutler@suse.com>
Fri, 6 Jul 2018 21:29:44 +0000 (23:29 +0200)
Fixes: http://tracker.ceph.com/issues/24779
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 093562f6de706cb810fef5b0a297fb2422c65c78)

src/pybind/mgr/mgr_module.py

index 1db2e71a425e39db33fc903fd8c6bfbf6f4f0ff1..f1e5c127f5e38c89c68b7e1d8298e4dfa18f860a 100644 (file)
@@ -3,6 +3,7 @@ import ceph_module  # noqa
 
 import json
 import logging
+import six
 import threading
 from collections import defaultdict
 import rados
@@ -141,7 +142,7 @@ class CRUSHMap(ceph_module.BasePyCRUSH):
 
     def get_take_weight_osd_map(self, root):
         uglymap = self._get_take_weight_osd_map(root)
-        return { int(k): v for k, v in uglymap.get('weights', {}).iteritems() }
+        return { int(k): v for k, v in six.iteritems(uglymap.get('weights', {})) }
 
     @staticmethod
     def have_default_choose_args(dump):