Replace future and final clean-up

aio-libs · Oct 23, 2023 · a2ec341 · a2ec341
1 parent 6d70164
commit a2ec341
Show file tree

Hide file tree

Showing 19 changed files with 9 additions and 3,522 deletions.
diff --git a/aiokafka/cluster.py b/aiokafka/cluster.py
@@ -4,7 +4,7 @@
 import threading
 import time
 
-from kafka.future import Future
+from concurrent.futures import Future
 
 from aiokafka import errors as Errors
 from aiokafka.conn import collect_hosts
@@ -189,7 +189,7 @@ def request_update(self):
         change the reported ttl()
 
         Returns:
-            kafka.future.Future (value will be the cluster object after update)
+            Future (value will be the cluster object after update)
         """
         with self._lock:
             self._need_update = True

diff --git a/aiokafka/coordinator/base.py b/aiokafka/coordinator/base.py
@@ -4,8 +4,7 @@
 import threading
 import time
 import weakref
-
-from kafka.future import Future
+from concurrent.futures import Future
 
 from aiokafka import errors as Errors
 from aiokafka.metrics import AnonMeasurable

diff --git a/aiokafka/coordinator/consumer.py b/aiokafka/coordinator/consumer.py
@@ -3,8 +3,7 @@
 import functools
 import logging
 import time
-
-from kafka.future import Future
+from concurrent.futures import Future
 
 import aiokafka.errors as Errors
 from aiokafka.metrics import AnonMeasurable
@@ -503,7 +502,7 @@ def commit_offsets_async(self, offsets, callback=None):
                 a commit request completes.
 
         Returns:
-            kafka.future.Future
+            Future
         """
         self._invoke_completed_offset_commit_callbacks()
         if not self.coordinator_unknown():

diff --git a/docs/examples/manual_commit.rst b/docs/examples/manual_commit.rst
@@ -22,7 +22,7 @@ Consumer:
 
     import json
     import asyncio
-    from kafka.common import KafkaError
+    from aiokafka.errors import KafkaError
     from aiokafka import AIOKafkaConsumer
 
     async def consume():

diff --git a/docs/examples/serialize_and_compress.rst b/docs/examples/serialize_and_compress.rst
@@ -49,7 +49,7 @@ Consumer
 
     import json
     import asyncio
-    from kafka.common import KafkaError
+    from aiokafka.errors import KafkaError
     from aiokafka import AIOKafkaConsumer
 
     def deserializer(serialized):

diff --git a/docs/examples/ssl_consume_produce.rst b/docs/examples/ssl_consume_produce.rst
@@ -11,7 +11,7 @@ information.
     import asyncio
     from aiokafka import AIOKafkaProducer, AIOKafkaConsumer
     from aiokafka.helpers import create_ssl_context
-    from kafka.common import TopicPartition
+    from aiokafka.errors import TopicPartition
 
     context = create_ssl_context(
         cafile="./ca-cert",  # CA used to sign certificate.

diff --git a/kafka/__init__.py b/kafka/__init__.py
diff --git a/kafka/future.py b/kafka/future.py
diff --git a/kafka/vendor/__init__.py b/kafka/vendor/__init__.py