summaryrefslogtreecommitdiff
path: root/kafka
diff options
context:
space:
mode:
Diffstat (limited to 'kafka')
-rw-r--r--kafka/common.py16
-rw-r--r--kafka/consumer.py7
-rw-r--r--kafka/protocol.py6
-rw-r--r--kafka/queue.py2
-rw-r--r--kafka/util.py9
5 files changed, 23 insertions, 17 deletions
diff --git a/kafka/common.py b/kafka/common.py
index 9aab8fc..0a1d314 100644
--- a/kafka/common.py
+++ b/kafka/common.py
@@ -64,3 +64,19 @@ class ErrorMapping(object):
MESSAGE_SIZE_TO_LARGE = 10
STALE_CONTROLLER_EPOCH = 11
OFFSET_METADATA_TOO_LARGE = 12
+
+#################
+# Exceptions #
+#################
+
+class BufferUnderflowError(Exception):
+ pass
+
+class ChecksumError(Exception):
+ pass
+
+class ConsumerFetchSizeTooSmall(Exception):
+ pass
+
+class ConsumerNoMoreData(Exception):
+ pass
diff --git a/kafka/consumer.py b/kafka/consumer.py
index 6ac13c7..c338337 100644
--- a/kafka/consumer.py
+++ b/kafka/consumer.py
@@ -8,12 +8,11 @@ from Queue import Empty
from kafka.common import (
ErrorMapping, FetchRequest,
- OffsetRequest, OffsetFetchRequest, OffsetCommitRequest
+ OffsetRequest, OffsetFetchRequest, OffsetCommitRequest,
+ ConsumerFetchSizeTooSmall, ConsumerNoMoreData
)
-from kafka.util import (
- ReentrantTimer, ConsumerFetchSizeTooSmall
-)
+from kafka.util import ReentrantTimer
log = logging.getLogger("kafka")
diff --git a/kafka/protocol.py b/kafka/protocol.py
index f985479..c2b017e 100644
--- a/kafka/protocol.py
+++ b/kafka/protocol.py
@@ -8,12 +8,12 @@ from kafka.codec import (
from kafka.common import (
BrokerMetadata, PartitionMetadata, Message, OffsetAndMessage,
ProduceResponse, FetchResponse, OffsetResponse,
- OffsetCommitResponse, OffsetFetchResponse
+ OffsetCommitResponse, OffsetFetchResponse,
+ BufferUnderflowError, ChecksumError, ConsumerFetchSizeTooSmall
)
from kafka.util import (
read_short_string, read_int_string, relative_unpack,
- write_short_string, write_int_string, group_by_topic_and_partition,
- BufferUnderflowError, ChecksumError, ConsumerFetchSizeTooSmall
+ write_short_string, write_int_string, group_by_topic_and_partition
)
log = logging.getLogger("kafka")
diff --git a/kafka/queue.py b/kafka/queue.py
index 3bd7dca..41f1c31 100644
--- a/kafka/queue.py
+++ b/kafka/queue.py
@@ -4,7 +4,7 @@ from multiprocessing import Process, Queue, Event
from Queue import Empty
import time
-from .client import KafkaClient, FetchRequest, ProduceRequest
+from kafka.client import KafkaClient, FetchRequest, ProduceRequest
log = logging.getLogger("kafka")
diff --git a/kafka/util.py b/kafka/util.py
index bdda7ed..d580ad7 100644
--- a/kafka/util.py
+++ b/kafka/util.py
@@ -66,15 +66,6 @@ def group_by_topic_and_partition(tuples):
return out
-class BufferUnderflowError(Exception):
- pass
-
-
-class ChecksumError(Exception):
- pass
-
-class ConsumerFetchSizeTooSmall(Exception):
- pass
class ReentrantTimer(object):
"""