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

4 files changed, 9 insertions, 10 deletions

diff --git a/kafka/consumer/base.py b/kafka/consumer/base.py
index 75c3ee1..d2d9e8d 100644
--- a/kafka/consumer/base.py
+++ b/kafka/consumer/base.py
@@ -6,12 +6,10 @@ import numbers
 from threading import Lock
 import warnings
 
-import kafka.common
-from kafka.common import (
-    OffsetRequestPayload, OffsetCommitRequestPayload, OffsetFetchRequestPayload,
-    UnknownTopicOrPartitionError, check_error, KafkaError
-)
-
+from kafka.errors import (
+    UnknownTopicOrPartitionError, check_error, KafkaError)
+from kafka.structs import (
+    OffsetRequestPayload, OffsetCommitRequestPayload, OffsetFetchRequestPayload)
 from kafka.util import ReentrantTimer
 
 
diff --git a/kafka/consumer/fetcher.py b/kafka/consumer/fetcher.py
index 7112c7e..2c9c0b9 100644
--- a/kafka/consumer/fetcher.py
+++ b/kafka/consumer/fetcher.py
@@ -6,12 +6,12 @@ import logging
 
 import six
 
-import kafka.common as Errors
-from kafka.common import TopicPartition
+import kafka.errors as Errors
 from kafka.future import Future
 from kafka.protocol.fetch import FetchRequest
 from kafka.protocol.message import PartialMessage
 from kafka.protocol.offset import OffsetRequest, OffsetResetStrategy
+from kafka.structs import TopicPartition
 
 log = logging.getLogger(__name__)
 
diff --git a/kafka/consumer/group.py b/kafka/consumer/group.py
index 9172040..6c85c21 100644
--- a/kafka/consumer/group.py
+++ b/kafka/consumer/group.py
@@ -7,13 +7,13 @@ import time
 import six
 
 from kafka.client_async import KafkaClient
-from kafka.common import TopicPartition
 from kafka.consumer.fetcher import Fetcher
 from kafka.consumer.subscription_state import SubscriptionState
 from kafka.coordinator.consumer import ConsumerCoordinator
 from kafka.coordinator.assignors.range import RangePartitionAssignor
 from kafka.coordinator.assignors.roundrobin import RoundRobinPartitionAssignor
 from kafka.protocol.offset import OffsetResetStrategy
+from kafka.structs import TopicPartition
 from kafka.version import __version__
 
 log = logging.getLogger(__name__)
diff --git a/kafka/consumer/subscription_state.py b/kafka/consumer/subscription_state.py
index 3d170ae..1c045aa 100644
--- a/kafka/consumer/subscription_state.py
+++ b/kafka/consumer/subscription_state.py
@@ -6,8 +6,9 @@ import re
 
 import six
 
-from kafka.common import IllegalStateError, OffsetAndMetadata
+from kafka.errors import IllegalStateError
 from kafka.protocol.offset import OffsetResetStrategy
+from kafka.structs import OffsetAndMetadata
 
 log = logging.getLogger(__name__)