Merge pull request #947 from ods/kafka-python-cleanup

Cleanup after kafka-python merge
aio-libs · Nov 29, 2023 · a25e5c2 · a25e5c2
2 parents 8814e7b + fdba764
commit a25e5c2
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 2,543 deletions.
diff --git a/aiokafka/consumer/consumer.py b/aiokafka/consumer/consumer.py
@@ -213,7 +213,7 @@ class AIOKafkaConsumer:
         sasl_plain_password (str): password for SASL ``PLAIN`` authentication.
             Default: None
         sasl_oauth_token_provider (~aiokafka.abc.AbstractTokenProvider):
-            OAuthBearer token provider instance. (See :mod:`aiokafka.oauth`).
+            OAuthBearer token provider instance.
             Default: None
 
     Note:

diff --git a/aiokafka/coordinator/base.py b/aiokafka/coordinator/base.py
diff --git a/aiokafka/coordinator/consumer.py b/aiokafka/coordinator/consumer.py
diff --git a/aiokafka/coordinator/heartbeat.py b/aiokafka/coordinator/heartbeat.py
diff --git a/aiokafka/oauth.py b/aiokafka/oauth.py
diff --git a/aiokafka/producer/producer.py b/aiokafka/producer/producer.py
@@ -165,8 +165,7 @@ class AIOKafkaProducer:
         sasl_plain_password (str): password for SASL ``PLAIN`` authentication.
             Default: :data:`None`
         sasl_oauth_token_provider (:class:`~aiokafka.abc.AbstractTokenProvider`):
-            OAuthBearer token provider instance. (See
-            :mod:`aiokafka.oauth`).
+            OAuthBearer token provider instance.
             Default: :data:`None`
 
     Note:

diff --git a/aiokafka/protocol/frame.py b/aiokafka/protocol/frame.py
diff --git a/aiokafka/protocol/message.py b/aiokafka/protocol/message.py
@@ -15,7 +15,6 @@
 from aiokafka.errors import UnsupportedCodecError
 from aiokafka.util import WeakMethod
 
-from .frame import KafkaBytes
 from .struct import Struct
 from .types import Int8, Int32, UInt32, Int64, Bytes, Schema, AbstractType
 
@@ -186,7 +185,7 @@ class MessageSet(AbstractType):
     @classmethod
     def encode(cls, items, prepend_size=True):
         # RecordAccumulator encodes messagesets internally
-        if isinstance(items, (io.BytesIO, KafkaBytes)):
+        if isinstance(items, io.BytesIO):
             size = Int32.decode(items)
             if prepend_size:
                 # rewind and return all the bytes
@@ -234,7 +233,7 @@ def decode(cls, data, bytes_to_read=None):
 
     @classmethod
     def repr(cls, messages):
-        if isinstance(messages, (KafkaBytes, io.BytesIO)):
+        if isinstance(messages, io.BytesIO):
             offset = messages.tell()
             decoded = cls.decode(messages)
             messages.seek(offset)

diff --git a/aiokafka/protocol/parser.py b/aiokafka/protocol/parser.py