Use absolute imports everywhere

kafka/__init__.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 __title__ = 'kafka'
-from .version import __version__
+from kafka.version import __version__
 __author__ = 'Dana Powers'
 __license__ = 'Apache License 2.0'
 __copyright__ = 'Copyright 2016 Dana Powers, David Arthur, and Contributors'

kafka/client_async.py

@@ -13,26 +13,26 @@
     import selectors  # pylint: disable=import-error
 except ImportError:
     # vendored backport module
-    from .vendor import selectors34 as selectors
+    from kafka.vendor import selectors34 as selectors
 
 import socket
 import time
 
 from kafka.vendor import six
 
-from .cluster import ClusterMetadata
-from .conn import BrokerConnection, ConnectionStates, collect_hosts, get_ip_port_afi
-from . import errors as Errors
-from .future import Future
-from .metrics import AnonMeasurable
-from .metrics.stats import Avg, Count, Rate
-from .metrics.stats.rate import TimeUnit
-from .protocol.metadata import MetadataRequest
-from .util import Dict, WeakMethod
+from kafka.cluster import ClusterMetadata
+from kafka.conn import BrokerConnection, ConnectionStates, collect_hosts, get_ip_port_afi
+from kafka import errors as Errors
+from kafka.future import Future
+from kafka.metrics import AnonMeasurable
+from kafka.metrics.stats import Avg, Count, Rate
+from kafka.metrics.stats.rate import TimeUnit
+from kafka.protocol.metadata import MetadataRequest
+from kafka.util import Dict, WeakMethod
 # Although this looks unused, it actually monkey-patches socket.socketpair()
 # and should be left in as long as we're using socket.socketpair() in this file
-from .vendor import socketpair
-from .version import __version__
+from kafka.vendor import socketpair
+from kafka.version import __version__
 
 if six.PY2:
     ConnectionError = None

kafka/cluster.py

@@ -8,9 +8,9 @@
 
 from kafka.vendor import six
 
-from . import errors as Errors
-from .future import Future
-from .structs import BrokerMetadata, PartitionMetadata, TopicPartition
+from kafka import errors as Errors
+from kafka.future import Future
+from kafka.structs import BrokerMetadata, PartitionMetadata, TopicPartition
 
 log = logging.getLogger(__name__)
 

kafka/conn.py

@@ -12,7 +12,7 @@
     import selectors  # pylint: disable=import-error
 except ImportError:
     # vendored backport module
-    from .vendor import selectors34 as selectors
+    from kafka.vendor import selectors34 as selectors
 
 import socket
 import struct
@@ -857,8 +857,8 @@ def check_version(self, timeout=2, strict=False):
         # vanilla MetadataRequest. If the server did not recognize the first
         # request, both will be failed with a ConnectionError that wraps
         # socket.error (32, 54, or 104)
-        from .protocol.admin import ApiVersionRequest, ListGroupsRequest
-        from .protocol.commit import OffsetFetchRequest, GroupCoordinatorRequest
+        from kafka.protocol.admin import ApiVersionRequest, ListGroupsRequest
+        from kafka.protocol.commit import OffsetFetchRequest, GroupCoordinatorRequest
 
         # Socket errors are logged as exceptions and can alarm users. Mute them
         from logging import Filter

kafka/consumer/__init__.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import
 
-from .simple import SimpleConsumer
-from .multiprocess import MultiProcessConsumer
-from .group import KafkaConsumer
+from kafka.consumer.simple import SimpleConsumer
+from kafka.consumer.multiprocess import MultiProcessConsumer
+from kafka.consumer.group import KafkaConsumer
 
 __all__ = [
     'SimpleConsumer', 'MultiProcessConsumer', 'KafkaConsumer'

kafka/consumer/multiprocess.py

@@ -8,15 +8,15 @@
 
 from kafka.vendor.six.moves import queue # pylint: disable=import-error
 
-from ..common import KafkaError
-from .base import (
+from kafka.common import KafkaError
+from kafka.consumer.base import (
     Consumer,
     AUTO_COMMIT_MSG_COUNT, AUTO_COMMIT_INTERVAL,
     NO_MESSAGES_WAIT_TIME_SECONDS,
     FULL_QUEUE_WAIT_TIME_SECONDS,
     MAX_BACKOFF_SECONDS,
 )
-from .simple import SimpleConsumer
+from kafka.consumer.simple import SimpleConsumer
 
 
 log = logging.getLogger(__name__)

kafka/consumer/simple.py

@@ -12,7 +12,7 @@
 from kafka.vendor import six
 from kafka.vendor.six.moves import queue # pylint: disable=import-error
 
-from .base import (
+from kafka.consumer.base import (
     Consumer,
     FETCH_DEFAULT_BLOCK_TIMEOUT,
     AUTO_COMMIT_MSG_COUNT,
@@ -24,7 +24,7 @@
     ITER_TIMEOUT_SECONDS,
     NO_MESSAGES_WAIT_TIME_SECONDS
 )
-from ..common import (
+from kafka.common import (
     FetchRequestPayload, KafkaError, OffsetRequestPayload,
     ConsumerFetchSizeTooSmall,
     UnknownTopicOrPartitionError, NotLeaderForPartitionError,

kafka/coordinator/assignors/range.py

@@ -5,8 +5,8 @@
 
 from kafka.vendor import six
 
-from .abstract import AbstractPartitionAssignor
-from ..protocol import ConsumerProtocolMemberMetadata, ConsumerProtocolMemberAssignment
+from kafka.coordinator.assignors.abstract import AbstractPartitionAssignor
+from kafka.coordinator.protocol import ConsumerProtocolMemberMetadata, ConsumerProtocolMemberAssignment
 
 log = logging.getLogger(__name__)
 

kafka/coordinator/assignors/roundrobin.py

@@ -6,9 +6,9 @@
 
 from kafka.vendor import six
 
-from .abstract import AbstractPartitionAssignor
-from ...common import TopicPartition
-from ..protocol import ConsumerProtocolMemberMetadata, ConsumerProtocolMemberAssignment
+from kafka.coordinator.assignors.abstract import AbstractPartitionAssignor
+from kafka.common import TopicPartition
+from kafka.coordinator.protocol import ConsumerProtocolMemberMetadata, ConsumerProtocolMemberAssignment
 
 log = logging.getLogger(__name__)
 

kafka/coordinator/base.py

@@ -10,13 +10,13 @@
 
 from kafka.vendor import six
 
-from .heartbeat import Heartbeat
-from .. import errors as Errors
-from ..future import Future
-from ..metrics import AnonMeasurable
-from ..metrics.stats import Avg, Count, Max, Rate
-from ..protocol.commit import GroupCoordinatorRequest, OffsetCommitRequest
-from ..protocol.group import (HeartbeatRequest, JoinGroupRequest,
+from kafka.coordinator.heartbeat import Heartbeat
+from kafka import errors as Errors
+from kafka.future import Future
+from kafka.metrics import AnonMeasurable
+from kafka.metrics.stats import Avg, Count, Max, Rate
+from kafka.protocol.commit import GroupCoordinatorRequest, OffsetCommitRequest
+from kafka.protocol.group import (HeartbeatRequest, JoinGroupRequest,
                             LeaveGroupRequest, SyncGroupRequest)
 
 log = logging.getLogger('kafka.coordinator')

kafka/coordinator/consumer.py

@@ -7,17 +7,17 @@
 
 from kafka.vendor import six
 
-from .base import BaseCoordinator, Generation
-from .assignors.range import RangePartitionAssignor
-from .assignors.roundrobin import RoundRobinPartitionAssignor
-from .protocol import ConsumerProtocol
-from .. import errors as Errors
-from ..future import Future
-from ..metrics import AnonMeasurable
-from ..metrics.stats import Avg, Count, Max, Rate
-from ..protocol.commit import OffsetCommitRequest, OffsetFetchRequest
-from ..structs import OffsetAndMetadata, TopicPartition
-from ..util import WeakMethod
+from kafka.coordinator.base import BaseCoordinator, Generation
+from kafka.coordinator.assignors.range import RangePartitionAssignor
+from kafka.coordinator.assignors.roundrobin import RoundRobinPartitionAssignor
+from kafka.coordinator.protocol import ConsumerProtocol
+from kafka import errors as Errors
+from kafka.future import Future
+from kafka.metrics import AnonMeasurable
+from kafka.metrics.stats import Avg, Count, Max, Rate
+from kafka.protocol.commit import OffsetCommitRequest, OffsetFetchRequest
+from kafka.structs import OffsetAndMetadata, TopicPartition
+from kafka.util import WeakMethod
 
 
 log = logging.getLogger(__name__)

kafka/metrics/__init__.py

@@ -1,13 +1,13 @@
 from __future__ import absolute_import
 
-from .compound_stat import NamedMeasurable
-from .dict_reporter import DictReporter
-from .kafka_metric import KafkaMetric
-from .measurable import AnonMeasurable
-from .metric_config import MetricConfig
-from .metric_name import MetricName
-from .metrics import Metrics
-from .quota import Quota
+from kafka.metrics.compound_stat import NamedMeasurable
+from kafka.metrics.dict_reporter import DictReporter
+from kafka.metrics.kafka_metric import KafkaMetric
+from kafka.metrics.measurable import AnonMeasurable
+from kafka.metrics.metric_config import MetricConfig
+from kafka.metrics.metric_name import MetricName
+from kafka.metrics.metrics import Metrics
+from kafka.metrics.quota import Quota
 
 __all__ = [
     'AnonMeasurable', 'DictReporter', 'KafkaMetric', 'MetricConfig',

kafka/metrics/stats/__init__.py

@@ -1,15 +1,15 @@
 from __future__ import absolute_import
 
-from .avg import Avg
-from .count import Count
-from .histogram import Histogram
-from .max_stat import Max
-from .min_stat import Min
-from .percentile import Percentile
-from .percentiles import Percentiles
-from .rate import Rate
-from .sensor import Sensor
-from .total import Total
+from kafka.metrics.stats.avg import Avg
+from kafka.metrics.stats.count import Count
+from kafka.metrics.stats.histogram import Histogram
+from kafka.metrics.stats.max_stat import Max
+from kafka.metrics.stats.min_stat import Min
+from kafka.metrics.stats.percentile import Percentile
+from kafka.metrics.stats.percentiles import Percentiles
+from kafka.metrics.stats.rate import Rate
+from kafka.metrics.stats.sensor import Sensor
+from kafka.metrics.stats.total import Total
 
 __all__ = [
     'Avg', 'Count', 'Histogram', 'Max', 'Min', 'Percentile', 'Percentiles',

kafka/partitioner/__init__.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import
 
-from .default import DefaultPartitioner
-from .hashed import HashedPartitioner, Murmur2Partitioner, LegacyPartitioner
-from .roundrobin import RoundRobinPartitioner
+from kafka.partitioner.default import DefaultPartitioner
+from kafka.partitioner.hashed import HashedPartitioner, Murmur2Partitioner, LegacyPartitioner
+from kafka.partitioner.roundrobin import RoundRobinPartitioner
 
 __all__ = [
     'DefaultPartitioner', 'RoundRobinPartitioner', 'HashedPartitioner',

kafka/partitioner/default.py

@@ -2,7 +2,7 @@
 
 import random
 
-from .hashed import murmur2
+from kafka.partitioner.hashed import murmur2
 
 
 class DefaultPartitioner(object):

kafka/partitioner/hashed.py

@@ -2,7 +2,7 @@
 
 from kafka.vendor import six
 
-from .base import Partitioner
+from kafka.partitioner.base import Partitioner
 
 
 class Murmur2Partitioner(Partitioner):

kafka/partitioner/roundrobin.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-from .base import Partitioner
+from kafka.partitioner.base import Partitioner
 
 
 class RoundRobinPartitioner(Partitioner):

kafka/producer/__init__.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import
 
-from .kafka import KafkaProducer
-from .simple import SimpleProducer
-from .keyed import KeyedProducer
+from kafka.producer.kafka import KafkaProducer
+from kafka.producer.simple import SimpleProducer
+from kafka.producer.keyed import KeyedProducer
 
 __all__ = [
     'KafkaProducer',

kafka/producer/buffer.py

@@ -5,7 +5,7 @@
 import threading
 import time
 
-from ..metrics.stats import Rate
+from kafka.metrics.stats import Rate
 
 import kafka.errors as Errors
 

kafka/producer/future.py

@@ -3,8 +3,8 @@
 import collections
 import threading
 
-from .. import errors as Errors
-from ..future import Future
+from kafka import errors as Errors
+from kafka.future import Future
 
 
 class FutureProduceResult(Future):

kafka/producer/kafka.py

@@ -8,20 +8,20 @@
 import time
 import weakref
 
-from ..vendor import six
-
-from .. import errors as Errors
-from ..client_async import KafkaClient, selectors
-from ..codec import has_gzip, has_snappy, has_lz4
-from ..metrics import MetricConfig, Metrics
-from ..partitioner.default import DefaultPartitioner
-from ..record.default_records import DefaultRecordBatchBuilder
-from ..record.legacy_records import LegacyRecordBatchBuilder
-from ..serializer import Serializer
-from ..structs import TopicPartition
-from .future import FutureRecordMetadata, FutureProduceResult
-from .record_accumulator import AtomicInteger, RecordAccumulator
-from .sender import Sender
+from kafka.vendor import six
+
+from kafka import errors as Errors
+from kafka.client_async import KafkaClient, selectors
+from kafka.codec import has_gzip, has_snappy, has_lz4
+from kafka.metrics import MetricConfig, Metrics
+from kafka.partitioner.default import DefaultPartitioner
+from kafka.record.default_records import DefaultRecordBatchBuilder
+from kafka.record.legacy_records import LegacyRecordBatchBuilder
+from kafka.serializer import Serializer
+from kafka.structs import TopicPartition
+from kafka.producer.future import FutureRecordMetadata, FutureProduceResult
+from kafka.producer.record_accumulator import AtomicInteger, RecordAccumulator
+from kafka.producer.sender import Sender
 
 
 log = logging.getLogger(__name__)

kafka/producer/keyed.py

@@ -3,8 +3,8 @@
 import logging
 import warnings
 
-from .base import Producer
-from ..partitioner import HashedPartitioner
+from kafka.producer.base import Producer
+from kafka.partitioner import HashedPartitioner
 
 
 log = logging.getLogger(__name__)

kafka/producer/record_accumulator.py

@@ -6,10 +6,10 @@
 import threading
 import time
 
-from .. import errors as Errors
-from .buffer import SimpleBufferPool
-from .future import FutureRecordMetadata, FutureProduceResult
-from ..structs import TopicPartition
+from kafka import errors as Errors
+from kafka.producer.buffer import SimpleBufferPool
+from kafka.producer.future import FutureRecordMetadata, FutureProduceResult
+from kafka.structs import TopicPartition
 from kafka.record.memory_records import MemoryRecordsBuilder
 from kafka.record.legacy_records import LegacyRecordBatchBuilder