Drop python2 support after kafka-python 2.3.x (#2699)

Author: dpkp

.github/workflows/python-package.yml

@@ -35,7 +35,7 @@ jobs:
           - "3.9.0"
           - "4.0.0"
         python:
-          - "3.13"
+          - "3.14"
         include:
           #- python: "pypy3.9"
           #  kafka: "2.6.0"
@@ -50,6 +50,8 @@ jobs:
             kafka: "4.0.0"
           - python: "3.12"
             kafka: "4.0.0"
+          - python: "3.13"
+            kafka: "4.0.0"
 
     steps:
       - uses: actions/checkout@v6

docs/compatibility.rst

@@ -16,6 +16,7 @@ Although kafka-python is tested and expected to work on recent broker versions,
 not all features are supported. Please see github open issues for feature tracking.
 PRs welcome!
 
-kafka-python is tested on python 2.7, and 3.8-3.13.
+kafka-python is tested on python 3.8-3.14.
+python 2.7 was supported through kafka-python release 2.3.
 
 Builds and tests via Github Actions Workflows.  See https://github.com/dpkp/kafka-python/actions

kafka/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 __title__ = 'kafka'
 from kafka.version import __version__
 __author__ = 'Dana Powers'
@@ -8,14 +6,8 @@
 
 # Set default logging handler to avoid "No handler found" warnings.
 import logging
-try:  # Python 2.7+
-    from logging import NullHandler
-except ImportError:
-    class NullHandler(logging.Handler):
-        def emit(self, record):
-            pass
 
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
 
 
 from kafka.admin import KafkaAdminClient

kafka/admin/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from kafka.admin.config_resource import ConfigResource, ConfigResourceType
 from kafka.admin.client import KafkaAdminClient
 from kafka.admin.acl_resource import (ACL, ACLFilter, ResourcePattern, ResourcePatternFilter, ACLOperation,

kafka/admin/__main__.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import sys
 
 from kafka.cli.admin import run_cli

kafka/admin/acl_resource.py

@@ -1,11 +1,4 @@
-from __future__ import absolute_import
-
-# enum in stdlib as of py3.4
-try:
-    from enum import IntEnum  # pylint: disable=import-error
-except ImportError:
-    # vendored backport module
-    from kafka.vendor.enum34 import IntEnum
+from enum import IntEnum
 
 from kafka.errors import IllegalArgumentError
 

kafka/admin/client.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division
-
 from collections import defaultdict
 import copy
 import itertools
@@ -8,7 +6,6 @@
 import time
 
 from . import ConfigResourceType
-from kafka.vendor import six
 
 from kafka.admin.acl_resource import ACLOperation, ACLPermissionType, ACLFilter, ACL, ResourcePattern, ResourceType, \
     ACLResourcePatternType, valid_acl_operations
@@ -122,8 +119,7 @@ class KafkaAdminClient(object):
         ssl_crlfile (str): Optional filename containing the CRL to check for
             certificate expiration. By default, no CRL check is done. When
             providing a file, only the leaf certificate will be checked against
-            this CRL. The CRL can only be checked with Python 3.4+ or 2.7.9+.
-            Default: None.
+            this CRL. Default: None.
         api_version (tuple): Specify which Kafka API version to use. If set
             to None, KafkaClient will attempt to infer the broker version by
             probing various APIs. Example: (0, 10, 2). Default: None
@@ -420,11 +416,7 @@ def _send_request_to_controller(self, request):
         raise RuntimeError("This should never happen, please file a bug with full stacktrace if encountered")
 
     def _parse_topic_request_response(self, topic_error_tuples, request, response, tries):
-        # Also small py2/py3 compatibility -- py3 can ignore extra values
-        # during unpack via: for x, y, *rest in list_of_values. py2 cannot.
-        # So for now we have to map across the list and explicitly drop any
-        # extra values (usually the error_message)
-        for topic, error_code in map(lambda e: e[:2], topic_error_tuples):
+        for topic, error_code, *_ in topic_error_tuples:
             error_type = Errors.for_code(error_code)
             if tries and error_type is Errors.NotControllerError:
                 # No need to inspect the rest of the errors for
@@ -439,12 +431,8 @@ def _parse_topic_request_response(self, topic_error_tuples, request, response, t
         return True
 
     def _parse_topic_partition_request_response(self, request, response, tries):
-        # Also small py2/py3 compatibility -- py3 can ignore extra values
-        # during unpack via: for x, y, *rest in list_of_values. py2 cannot.
-        # So for now we have to map across the list and explicitly drop any
-        # extra values (usually the error_message)
         for topic, partition_results in response.replication_election_results:
-            for partition_id, error_code in map(lambda e: e[:2], partition_results):
+            for partition_id, error_code, *_ in partition_results:
                 error_type = Errors.for_code(error_code)
                 if tries and error_type is Errors.NotControllerError:
                     # No need to inspect the rest of the errors for
@@ -1418,7 +1406,7 @@ def _list_consumer_group_offsets_request(self, group_id, partitions=None):
             topics_partitions_dict = defaultdict(set)
             for topic, partition in partitions:
                 topics_partitions_dict[topic].add(partition)
-            topics_partitions = list(six.iteritems(topics_partitions_dict))
+            topics_partitions = list(topics_partitions_dict.items())
         return OffsetFetchRequest[version](group_id, topics_partitions)
 
     def _list_consumer_group_offsets_process_response(self, response):

kafka/admin/config_resource.py

@@ -1,11 +1,4 @@
-from __future__ import absolute_import
-
-# enum in stdlib as of py3.4
-try:
-    from enum import IntEnum  # pylint: disable=import-error
-except ImportError:
-    # vendored backport module
-    from kafka.vendor.enum34 import IntEnum
+from enum import IntEnum
 
 
 class ConfigResourceType(IntEnum):

kafka/admin/new_partitions.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-
-
 class NewPartitions(object):
     """A class for new partition creation on existing topics.  Note that the length of new_assignments, if specified,
     must be the difference between the new total number of partitions and the existing number of partitions.

kafka/admin/new_topic.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-
-
 class NewTopic(object):
     """ A class for new topic creation
     Arguments: