From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 5 Jul 2018 15:33:45 +0000 (+0200)
Subject: mgr: replace iteritems with six.iteritems (crash)
X-Git-Tag: v14.0.1~929^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9aa1d49583ae8fb658967c054247cac6ec2125ab;p=ceph.git

mgr: replace iteritems with six.iteritems (crash)

Fixes: http://tracker.ceph.com/issues/24779
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/src/pybind/mgr/crash/module.py b/src/pybind/mgr/crash/module.py
index 668ef62ea846..93edea19e993 100644
--- a/src/pybind/mgr/crash/module.py
+++ b/src/pybind/mgr/crash/module.py
@@ -2,6 +2,7 @@ from mgr_module import MgrModule
 import datetime
 import errno
 import json
+import six
 
 
 DATEFMT = '%Y-%m-%d %H:%M:%S.%f'
@@ -82,7 +83,7 @@ class Module(MgrModule):
 
         keeptime = datetime.timedelta(days=keep)
 
-        for key, meta in self.get_store_prefix('crash/').iteritems():
+        for key, meta in six.iteritems(self.get_store_prefix('crash/')):
             meta = json.loads(meta)
             stamp = self.time_from_string(meta['timestamp'])
             if stamp <= now - keeptime:
@@ -116,7 +117,7 @@ class Module(MgrModule):
                 'idlist': list()
             }
 
-        for key, meta in self.get_store_prefix('crash/').iteritems():
+        for key, meta in six.iteritems(self.get_store_prefix('crash/')):
             total += 1
             meta = json.loads(meta)
             stamp = self.time_from_string(meta['timestamp'])