Don't use `kafka.common` internallydont-use-kafka.common-internally

This finishes the split from `kafka.common` to `kafka.errors`/`kafka.structs`.

6 files changed, 14 insertions, 13 deletions

diff --git a/test/test_client_async.py b/test/test_client_async.py
index eccb564..09781ac 100644
--- a/test/test_client_async.py
+++ b/test/test_client_async.py
@@ -13,14 +13,13 @@ import time
 import pytest
 
 from kafka.client_async import KafkaClient, IdleConnectionManager
+from kafka.cluster import ClusterMetadata
 from kafka.conn import ConnectionStates
 import kafka.errors as Errors
 from kafka.future import Future
 from kafka.protocol.metadata import MetadataResponse, MetadataRequest
 from kafka.protocol.produce import ProduceRequest
 from kafka.structs import BrokerMetadata
-from kafka.cluster import ClusterMetadata
-from kafka.future import Future
 
 
 @pytest.fixture
diff --git a/test/test_conn.py b/test/test_conn.py
index fbdeeb9..27d77be 100644
--- a/test/test_conn.py
+++ b/test/test_conn.py
@@ -13,7 +13,7 @@ from kafka.protocol.api import RequestHeader
 from kafka.protocol.metadata import MetadataRequest
 from kafka.protocol.produce import ProduceRequest
 
-import kafka.common as Errors
+import kafka.errors as Errors
 
 
 @pytest.fixture
diff --git a/test/test_coordinator.py b/test/test_coordinator.py
index 7a2627e..4afdcd9 100644
--- a/test/test_coordinator.py
+++ b/test/test_coordinator.py
@@ -5,7 +5,6 @@ import time
 import pytest
 
 from kafka.client_async import KafkaClient
-from kafka.structs import TopicPartition, OffsetAndMetadata
 from kafka.consumer.subscription_state import (
     SubscriptionState, ConsumerRebalanceListener)
 from kafka.coordinator.assignors.range import RangePartitionAssignor
@@ -21,6 +20,7 @@ from kafka.protocol.commit import (
     OffsetCommitRequest, OffsetCommitResponse,
     OffsetFetchRequest, OffsetFetchResponse)
 from kafka.protocol.metadata import MetadataResponse
+from kafka.structs import TopicPartition, OffsetAndMetadata
 from kafka.util import WeakMethod
 
 
@@ -34,7 +34,7 @@ def coordinator(client):
 
 
 def test_init(client, coordinator):
-    # metadata update on init 
+    # metadata update on init
     assert client.cluster._need_update is True
     assert WeakMethod(coordinator._handle_metadata_update) in client.cluster._listeners
 
@@ -542,7 +542,7 @@ def test_send_offset_fetch_request_success(patched_coord, partitions):
     response = OffsetFetchResponse[0]([('foobar', [(0, 123, b'', 0), (1, 234, b'', 0)])])
     _f.success(response)
     patched_coord._handle_offset_fetch_response.assert_called_with(
-        future, response) 
+        future, response)
 
 
 @pytest.mark.parametrize('response,error,dead', [
diff --git a/test/test_fetcher.py b/test/test_fetcher.py
index fc031f7..c821018 100644
--- a/test/test_fetcher.py
+++ b/test/test_fetcher.py
@@ -12,16 +12,16 @@ from kafka.consumer.fetcher import (
     CompletedFetch, ConsumerRecord, Fetcher, NoOffsetForPartitionError
 )
 from kafka.consumer.subscription_state import SubscriptionState
+from kafka.future import Future
 from kafka.metrics import Metrics
 from kafka.protocol.fetch import FetchRequest, FetchResponse
 from kafka.protocol.offset import OffsetResponse
-from kafka.structs import TopicPartition
-from kafka.future import Future
 from kafka.errors import (
     StaleMetadata, LeaderNotAvailableError, NotLeaderForPartitionError,
     UnknownTopicOrPartitionError, OffsetOutOfRangeError
 )
 from kafka.record.memory_records import MemoryRecordsBuilder, MemoryRecords
+from kafka.structs import TopicPartition
 
 
 @pytest.fixture
diff --git a/test/test_util.py b/test/test_util.py
index 58e5ab8..fb592e8 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -5,8 +5,8 @@ import six
 from . import unittest
 
 import kafka.errors
-import kafka.util
 import kafka.structs
+import kafka.util
 
 
 class UtilTest(unittest.TestCase):
diff --git a/test/testutil.py b/test/testutil.py
index 365e47f..a1383a0 100644
--- a/test/testutil.py
+++ b/test/testutil.py
@@ -11,10 +11,12 @@ import pytest
 from . import unittest
 
 from kafka import SimpleClient, create_message
-from kafka.errors import LeaderNotAvailableError, KafkaTimeoutError, InvalidTopicError
-from kafka.structs import OffsetRequestPayload, ProduceRequestPayload, \
-                          NotLeaderForPartitionError, UnknownTopicOrPartitionError, \
-                          FailedPayloadsError
+from kafka.errors import (
+    LeaderNotAvailableError, KafkaTimeoutError, InvalidTopicError,
+    NotLeaderForPartitionError, UnknownTopicOrPartitionError,
+    FailedPayloadsError
+)
+from kafka.structs import OffsetRequestPayload, ProduceRequestPayload
 from test.fixtures import random_string, version_str_to_list, version as kafka_version #pylint: disable=wrong-import-order
 
 def kafka_versions(*versions):