summaryrefslogtreecommitdiff
path: root/kafka
diff options
context:
space:
mode:
authorDana Powers <dana.powers@rd.io>2014-09-16 22:31:19 -0700
committerDana Powers <dana.powers@rd.io>2014-12-15 12:42:56 -0800
commit6b44828685e75117d9def8a80b165e6154f78e11 (patch)
tree8cddd82fbc54c5f99fc00768735010d6df9f8afa /kafka
parent6e6ae533272ed32d150221534a16d588e42f9c51 (diff)
downloadkafka-python-6b44828685e75117d9def8a80b165e6154f78e11.tar.gz
Move KafkaConsumer to kafka.consumer.kafka module; make available for import from kafka at top-level
Diffstat (limited to 'kafka')
-rw-r--r--kafka/__init__.py2
-rw-r--r--kafka/consumer/__init__.py3
-rw-r--r--kafka/consumer/kafka.py (renamed from kafka/consumer/new.py)4
3 files changed, 5 insertions, 4 deletions
diff --git a/kafka/__init__.py b/kafka/__init__.py
index 58ca619..16b9094 100644
--- a/kafka/__init__.py
+++ b/kafka/__init__.py
@@ -13,7 +13,7 @@ from kafka.protocol import (
)
from kafka.producer import SimpleProducer, KeyedProducer
from kafka.partitioner import RoundRobinPartitioner, HashedPartitioner
-from kafka.consumer import SimpleConsumer, MultiProcessConsumer
+from kafka.consumer import SimpleConsumer, MultiProcessConsumer, KafkaConsumer
__all__ = [
'KafkaClient', 'KafkaConnection', 'SimpleProducer', 'KeyedProducer',
diff --git a/kafka/consumer/__init__.py b/kafka/consumer/__init__.py
index d2fa306..935f56e 100644
--- a/kafka/consumer/__init__.py
+++ b/kafka/consumer/__init__.py
@@ -1,6 +1,7 @@
from .simple import SimpleConsumer
from .multiprocess import MultiProcessConsumer
+from .kafka import KafkaConsumer
__all__ = [
- 'SimpleConsumer', 'MultiProcessConsumer'
+ 'SimpleConsumer', 'MultiProcessConsumer', 'KafkaConsumer'
]
diff --git a/kafka/consumer/new.py b/kafka/consumer/kafka.py
index 90770b5..af1a9cf 100644
--- a/kafka/consumer/new.py
+++ b/kafka/consumer/kafka.py
@@ -103,7 +103,7 @@ class KafkaConsumer(object):
Configuration settings can be passed to constructor,
otherwise defaults will be used:
- client_id='kafka.consumer.XXX',
+ client_id='kafka.consumer.kafka',
group_id=None,
fetch_message_max_bytes=1024*1024,
fetch_min_bytes=1,
@@ -129,7 +129,7 @@ class KafkaConsumer(object):
"""
Configuration settings can be passed to constructor,
otherwise defaults will be used:
- client_id='kafka.consumer.XXX',
+ client_id='kafka.consumer.kafka',
group_id=None,
fetch_message_max_bytes=1024*1024,
fetch_min_bytes=1,