From 0e54b123a29c630bae6225bf34e25d4bd2bc6997 Mon Sep 17 00:00:00 2001 From: Jeff Widman Date: Fri, 6 Oct 2017 16:35:03 -0700 Subject: Use six.iteritems(d) rather than d.items() --- kafka/consumer/group.py | 4 ++-- kafka/producer/kafka.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kafka/consumer/group.py b/kafka/consumer/group.py index 049d5d9..8ae7be0 100644 --- a/kafka/consumer/group.py +++ b/kafka/consumer/group.py @@ -857,7 +857,7 @@ class KafkaConsumer(six.Iterator): return self._metrics.metrics metrics = {} - for k, v in self._metrics.metrics.items(): + for k, v in six.iteritems(self._metrics.metrics): if k.group not in metrics: metrics[k.group] = {} if k.name not in metrics[k.group]: @@ -902,7 +902,7 @@ class KafkaConsumer(six.Iterator): raise UnsupportedVersionError( "offsets_for_times API not supported for cluster version {}" .format(self.config['api_version'])) - for tp, ts in timestamps.items(): + for tp, ts in six.iteritems(timestamps): timestamps[tp] = int(ts) if ts < 0: raise ValueError( diff --git a/kafka/producer/kafka.py b/kafka/producer/kafka.py index 18a3139..2a325ca 100644 --- a/kafka/producer/kafka.py +++ b/kafka/producer/kafka.py @@ -8,6 +8,8 @@ import threading import time import weakref +from ..vendor import six + from .. import errors as Errors from ..client_async import KafkaClient, selectors from ..metrics import MetricConfig, Metrics @@ -666,7 +668,7 @@ class KafkaProducer(object): return self._metrics.metrics metrics = {} - for k, v in self._metrics.metrics.items(): + for k, v in six.iteritems(self._metrics.metrics): if k.group not in metrics: metrics[k.group] = {} if k.name not in metrics[k.group]: -- cgit v1.2.1