From 9aa1d49583ae8fb658967c054247cac6ec2125ab Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 5 Jul 2018 17:33:45 +0200 Subject: [PATCH] mgr: replace iteritems with six.iteritems (crash) Fixes: http://tracker.ceph.com/issues/24779 Signed-off-by: Nathan Cutler --- src/pybind/mgr/crash/module.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/crash/module.py b/src/pybind/mgr/crash/module.py index 668ef62ea8464..93edea19e9934 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']) -- 2.39.5