Update imports from kafka.common -> kafka.errors / kafka.structs

6 files changed, 12 insertions, 14 deletions

diff --git a/kafka/producer/base.py b/kafka/producer/base.py
index 2067c7e..07e61d5 100644
--- a/kafka/producer/base.py
+++ b/kafka/producer/base.py
@@ -14,13 +14,12 @@ from threading import Thread, Event
 
 import six
 
-from kafka.common import (
-    ProduceRequestPayload, ProduceResponsePayload, TopicPartition, RetryOptions,
+from kafka.structs import (
+    ProduceRequestPayload, ProduceResponsePayload, TopicPartition, RetryOptions)
+from kafka.errors import (
     kafka_errors, UnsupportedCodecError, FailedPayloadsError,
     RequestTimedOutError, AsyncProducerQueueFull, UnknownError,
-    RETRY_ERROR_TYPES, RETRY_BACKOFF_ERROR_TYPES, RETRY_REFRESH_ERROR_TYPES
-)
-
+    RETRY_ERROR_TYPES, RETRY_BACKOFF_ERROR_TYPES, RETRY_REFRESH_ERROR_TYPES)
 from kafka.protocol import CODEC_NONE, ALL_CODECS, create_message_set
 
 log = logging.getLogger('kafka.producer')
diff --git a/kafka/producer/buffer.py b/kafka/producer/buffer.py
index 8c83ffc..b2ac747 100644
--- a/kafka/producer/buffer.py
+++ b/kafka/producer/buffer.py
@@ -7,10 +7,10 @@ import time
 
 from ..codec import (has_gzip, has_snappy, has_lz4,
                      gzip_encode, snappy_encode, lz4_encode)
+from .. import errors as Errors
 from ..protocol.types import Int32, Int64
 from ..protocol.message import MessageSet, Message
 
-import kafka.common as Errors
 
 
 class MessageSetBuffer(object):
diff --git a/kafka/producer/future.py b/kafka/producer/future.py
index 5a7a9dc..35520d8 100644
--- a/kafka/producer/future.py
+++ b/kafka/producer/future.py
@@ -3,10 +3,9 @@ from __future__ import absolute_import
 import collections
 import threading
 
+from .. import errors as Errors
 from ..future import Future
 
-import kafka.common as Errors
-
 
 class FutureProduceResult(Future):
     def __init__(self, topic_partition):
diff --git a/kafka/producer/kafka.py b/kafka/producer/kafka.py
index e1a0374..dd8e71f 100644
--- a/kafka/producer/kafka.py
+++ b/kafka/producer/kafka.py
@@ -8,14 +8,14 @@ import threading
 import time
 
 from ..client_async import KafkaClient
-from ..common import TopicPartition
+from ..structs import TopicPartition
 from ..partitioner.default import DefaultPartitioner
 from ..protocol.message import Message, MessageSet
+from .. import errors as Errors
 from .future import FutureRecordMetadata, FutureProduceResult
 from .record_accumulator import AtomicInteger, RecordAccumulator
 from .sender import Sender
 
-import kafka.common as Errors
 
 log = logging.getLogger(__name__)
 PRODUCER_CLIENT_ID_SEQUENCE = AtomicInteger()
diff --git a/kafka/producer/record_accumulator.py b/kafka/producer/record_accumulator.py
index 19dc199..b3abaa3 100644
--- a/kafka/producer/record_accumulator.py
+++ b/kafka/producer/record_accumulator.py
@@ -8,12 +8,12 @@ import time
 
 import six
 
-from ..common import TopicPartition
+from .. import errors as Errors
+from ..structs import TopicPartition
 from ..protocol.message import Message, MessageSet
 from .buffer import MessageSetBuffer, SimpleBufferPool
 from .future import FutureRecordMetadata, FutureProduceResult
 
-import kafka.common as Errors
 
 
 log = logging.getLogger(__name__)
diff --git a/kafka/producer/sender.py b/kafka/producer/sender.py
index 9a86a16..3cafb26 100644
--- a/kafka/producer/sender.py
+++ b/kafka/producer/sender.py
@@ -7,11 +7,11 @@ import threading
 
 import six
 
-from ..common import TopicPartition
+from .. import errors as Errors
+from ..structs import TopicPartition
 from ..version import __version__
 from ..protocol.produce import ProduceRequest
 
-import kafka.common as Errors
 
 
 log = logging.getLogger(__name__)