diff options
| author | Dana Powers <dana.powers@rd.io> | 2015-12-21 01:37:25 -0800 |
|---|---|---|
| committer | Dana Powers <dana.powers@rd.io> | 2015-12-28 13:44:29 -0800 |
| commit | c9e6f17e42e410adfe583d987c516149bdcdcdae (patch) | |
| tree | 9ec12383f55c9dcd001516f6982e4437af4de408 /kafka | |
| parent | fd1801907f85ac7686b9452c08ae908c3a88cd51 (diff) | |
| download | kafka-python-c9e6f17e42e410adfe583d987c516149bdcdcdae.tar.gz | |
Rename TopicAndPartition -> TopicPartition
Diffstat (limited to 'kafka')
| -rw-r--r-- | kafka/client.py | 8 | ||||
| -rw-r--r-- | kafka/common.py | 2 | ||||
| -rw-r--r-- | kafka/producer/base.py | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kafka/client.py b/kafka/client.py index 7f9969e..2f070cd 100644 --- a/kafka/client.py +++ b/kafka/client.py @@ -8,7 +8,7 @@ import time import six import kafka.common -from kafka.common import (TopicAndPartition, BrokerMetadata, UnknownError, +from kafka.common import (TopicPartition, BrokerMetadata, UnknownError, ConnectionError, FailedPayloadsError, KafkaTimeoutError, KafkaUnavailableError, LeaderNotAvailableError, UnknownTopicOrPartitionError, @@ -41,7 +41,7 @@ class KafkaClient(object): self._conns = {} self.brokers = {} # broker_id -> BrokerMetadata - self.topics_to_brokers = {} # TopicAndPartition -> BrokerMetadata + self.topics_to_brokers = {} # TopicPartition -> BrokerMetadata self.topic_partitions = {} # topic -> partition -> PartitionMetadata self.load_metadata_for_topics() # bootstrap with all metadata @@ -77,7 +77,7 @@ class KafkaClient(object): no current leader """ - key = TopicAndPartition(topic, partition) + key = TopicPartition(topic, partition) # Use cached metadata if it is there if self.topics_to_brokers.get(key) is not None: @@ -511,7 +511,7 @@ class KafkaClient(object): self.topic_partitions[topic][partition] = leader # Populate topics_to_brokers dict - topic_part = TopicAndPartition(topic, partition) + topic_part = TopicPartition(topic, partition) # Check for partition errors if error: diff --git a/kafka/common.py b/kafka/common.py index f79150b..6a32372 100644 --- a/kafka/common.py +++ b/kafka/common.py @@ -72,7 +72,7 @@ OffsetAndMessage = namedtuple("OffsetAndMessage", Message = namedtuple("Message", ["magic", "attributes", "key", "value"]) -TopicAndPartition = namedtuple("TopicAndPartition", +TopicPartition = namedtuple("TopicPartition", ["topic", "partition"]) KafkaMessage = namedtuple("KafkaMessage", diff --git a/kafka/producer/base.py b/kafka/producer/base.py index 595ac37..4972cd4 100644 --- a/kafka/producer/base.py +++ b/kafka/producer/base.py @@ -15,7 +15,7 @@ from threading import Thread, Event import six from kafka.common import ( - ProduceRequestPayload, ProduceResponsePayload, TopicAndPartition, RetryOptions, + ProduceRequestPayload, ProduceResponsePayload, TopicPartition, RetryOptions, kafka_errors, UnsupportedCodecError, FailedPayloadsError, RequestTimedOutError, AsyncProducerQueueFull, UnknownError, RETRY_ERROR_TYPES, RETRY_BACKOFF_ERROR_TYPES, RETRY_REFRESH_ERROR_TYPES @@ -386,7 +386,7 @@ class Producer(object): if self.async: for idx, m in enumerate(msg): try: - item = (TopicAndPartition(topic, partition), m, key) + item = (TopicPartition(topic, partition), m, key) if self.async_queue_put_timeout == 0: self.queue.put_nowait(item) else: |