From 3b779c7fac2aa9a3dd831efaa5629e44a1f12b4f Mon Sep 17 00:00:00 2001 From: Dana Powers Date: Sun, 22 Mar 2026 22:18:35 -0700 Subject: [PATCH 1/3] Switch a few more old->new kafka.protocol imports --- kafka/admin/client.py | 2 +- test/conftest.py | 2 +- test/integration/fixtures.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kafka/admin/client.py b/kafka/admin/client.py index f325f6239..515401ada 100644 --- a/kafka/admin/client.py +++ b/kafka/admin/client.py @@ -23,7 +23,7 @@ CreateTopicsRequest, DeleteTopicsRequest, DescribeConfigsRequest, AlterConfigsRequest, CreatePartitionsRequest, ListGroupsRequest, DescribeGroupsRequest, DescribeAclsRequest, CreateAclsRequest, DeleteAclsRequest, DeleteGroupsRequest, DeleteRecordsRequest, DescribeLogDirsRequest, ElectLeadersRequest, ElectionType) -from kafka.protocol.commit import OffsetFetchRequest +from kafka.protocol.new.consumer import OffsetFetchRequest from kafka.protocol.new.metadata import MetadataRequest, FindCoordinatorRequest from kafka.protocol.types import Array from kafka.structs import TopicPartition, OffsetAndMetadata, MemberInformation, GroupInformation diff --git a/test/conftest.py b/test/conftest.py index 263fc0f3c..f399b00cb 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -17,7 +17,7 @@ def conn(mocker): """Return a connection mocker fixture""" from kafka.conn import ConnectionStates from kafka.future import Future - from kafka.protocol.metadata import MetadataResponse + from kafka.protocol.new.metadata import MetadataResponse conn = mocker.patch('kafka.client_async.BrokerConnection') conn.return_value = conn conn.state = ConnectionStates.CONNECTED diff --git a/test/integration/fixtures.py b/test/integration/fixtures.py index 245bdbfb8..6a7422fdb 100644 --- a/test/integration/fixtures.py +++ b/test/integration/fixtures.py @@ -13,8 +13,8 @@ from kafka import errors, KafkaAdminClient, KafkaClient, KafkaConsumer, KafkaProducer from kafka.errors import InvalidReplicationFactorError, KafkaTimeoutError -from kafka.protocol.admin import CreateTopicsRequest -from kafka.protocol.metadata import MetadataRequest +from kafka.protocol.new.admin import CreateTopicsRequest +from kafka.protocol.new.metadata import MetadataRequest from test.testutil import env_kafka_version, random_string from test.service import ExternalService, SpawnedService From fafea9bf95fdcc15f7d3b968e3314f0c38333a05 Mon Sep 17 00:00:00 2001 From: Dana Powers Date: Sun, 22 Mar 2026 22:19:17 -0700 Subject: [PATCH 2/3] test_sasl_integration --- test/integration/test_sasl_integration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/test_sasl_integration.py b/test/integration/test_sasl_integration.py index 69323fb92..a4df90898 100644 --- a/test/integration/test_sasl_integration.py +++ b/test/integration/test_sasl_integration.py @@ -5,7 +5,7 @@ import pytest from kafka.admin import NewTopic -from kafka.protocol.metadata import MetadataRequest_v1 +from kafka.protocol.new.metadata import MetadataRequest from test.testutil import assert_message_count, env_kafka_version, random_string, special_to_underscore @@ -69,7 +69,7 @@ def test_client(request, sasl_kafka): sasl_kafka.create_topics([topic_name], num_partitions=1) client, = sasl_kafka.get_clients(1) - request = MetadataRequest_v1(None) + request = MetadataRequest(topics=None, version=1) timeout_at = time.time() + 1 while not client.is_ready(0): client.maybe_connect(0) From 736b366a14577257c9d84cb3fe3ba9582ff99d73 Mon Sep 17 00:00:00 2001 From: Dana Powers Date: Sun, 22 Mar 2026 22:39:28 -0700 Subject: [PATCH 3/3] drop unused Array --- kafka/admin/client.py | 1 - 1 file changed, 1 deletion(-) diff --git a/kafka/admin/client.py b/kafka/admin/client.py index 515401ada..3b16f0d3f 100644 --- a/kafka/admin/client.py +++ b/kafka/admin/client.py @@ -25,7 +25,6 @@ DeleteGroupsRequest, DeleteRecordsRequest, DescribeLogDirsRequest, ElectLeadersRequest, ElectionType) from kafka.protocol.new.consumer import OffsetFetchRequest from kafka.protocol.new.metadata import MetadataRequest, FindCoordinatorRequest -from kafka.protocol.types import Array from kafka.structs import TopicPartition, OffsetAndMetadata, MemberInformation, GroupInformation from kafka.version import __version__