summaryrefslogtreecommitdiff
path: root/test/test_client.py
diff options
context:
space:
mode:
authorEnrico Canzonieri <ecanzonieri@gmail.com>2015-01-26 15:01:51 -0800
committerEnrico Canzonieri <enrico@yelp.com>2015-01-26 15:01:51 -0800
commit9ab8415ed75b08c5de9f823708027bb4f10a0643 (patch)
treef2011cb5cbdc4d5cd3d9bff9c52b35c2a6aca2ad /test/test_client.py
parentf517ddf283a86947a15f95e5ec562e81f4c477e5 (diff)
parent587206ff6ad59ae01248d24ff9c9fadbdfc1c1fc (diff)
downloadkafka-python-9ab8415ed75b08c5de9f823708027bb4f10a0643.tar.gz
Merge branch 'master' of github.com:mumrah/kafka-python into validate_consumer_offset
Conflicts: kafka/consumer/simple.py
Diffstat (limited to 'test/test_client.py')
-rw-r--r--test/test_client.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/test_client.py b/test/test_client.py
index ba6e3b1..c522d9a 100644
--- a/test/test_client.py
+++ b/test/test_client.py
@@ -10,9 +10,8 @@ from kafka.common import (
ProduceRequest, MetadataResponse,
BrokerMetadata, TopicMetadata, PartitionMetadata,
TopicAndPartition, KafkaUnavailableError,
- LeaderNotAvailableError, NoError,
- UnknownTopicOrPartitionError, KafkaTimeoutError,
- ConnectionError
+ LeaderNotAvailableError, UnknownTopicOrPartitionError,
+ KafkaTimeoutError, ConnectionError
)
from kafka.conn import KafkaConnection
from kafka.protocol import KafkaProtocol, create_message