kafka-python 3.0.7__py3-none-any.whl → 3.0.9__py3-none-any.whl

kafka/consumer/subscription_state.py

@@ -290,6 +290,9 @@ class SubscriptionState:
         for tp in list(self.assignment.keys()):
             if tp not in new_set:
                 del self.assignment[tp]
+            else:
+                # Retained partitions are no longer pending_revocation
+                self.assignment[tp].mark_pending_revocation(False)
         # Add new partitions; kept partitions retain their existing
         # TopicPartitionState (positions, paused flag, KIP-392 cache,
         # etc.).
@@ -651,12 +654,12 @@ class TopicPartitionState:
     def resume(self):
         self.paused = False
 
-    def mark_pending_revocation(self):
+    def mark_pending_revocation(self, val=True):
         """KIP-429: gate fetches while an on_partitions_revoked /
         on_partitions_lost listener is in progress for this partition.
         Single-shot: the surrounding ``assign_from_subscribed`` drops
         the state object once the listener returns."""
-        self._pending_revocation = True
+        self._pending_revocation = val
 
     def is_fetchable(self):
         return (not self.paused

kafka/net/manager.py

@@ -3,7 +3,6 @@ import logging
 import inspect
 import random
 import socket
-import ssl
 import time
 
 from .inet import create_connection
@@ -205,35 +204,16 @@ class KafkaConnectionManager:
     def ssl_enabled(self):
         return self.config['security_protocol'] in ('SSL', 'SASL_SSL')
 
-    def _build_ssl_context(self):
-        if self.config['ssl_context'] is not None:
-            return self.config['ssl_context']
-        ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-        ctx.minimum_version = ssl.TLSVersion.TLSv1_2
-        ctx.check_hostname = self.config['ssl_check_hostname']
-        if self.config['ssl_cafile']:
-            ctx.load_verify_locations(self.config['ssl_cafile'])
-        else:
-            ctx.load_default_certs()
-        if self.config['ssl_certfile']:
-            ctx.load_cert_chain(
-                certfile=self.config['ssl_certfile'],
-                keyfile=self.config['ssl_keyfile'],
-                password=self.config['ssl_password'],
-            )
-        if self.config['ssl_crlfile']:
-            ctx.load_verify_locations(crl=self.config['ssl_crlfile'])
-            ctx.verify_flags |= ssl.VERIFY_CRL_CHECK_LEAF
-        return ctx
-
     async def _build_transport(self, node, timeout_at=None):
         sock = await create_connection(self._net, node.host, node.port,
                                        self.config['socket_options'],
                                        proxy_url=self.config['proxy_url'],
                                        timeout_at=timeout_at)
         if self.ssl_enabled:
-            transport = KafkaSSLTransport(self._net, sock, self._build_ssl_context(),
-                                          host=node.host, ssl_check_hostname=self.config['ssl_check_hostname'])
+            ssl_configs = {key: value
+                           for key, value in self.config.items()
+                           if key.startswith('ssl_')}
+            transport = KafkaSSLTransport(self._net, sock, host=node.host, **ssl_configs)
         else:
             transport = KafkaTCPTransport(self._net, sock, host=node.host)
 

kafka/net/transport.py

@@ -1,4 +1,5 @@
 from collections import deque
+import copy
 import logging
 import selectors
 import socket
@@ -371,13 +372,49 @@ class KafkaTCPTransport:
 
 
 class KafkaSSLTransport(KafkaTCPTransport):
-    def __init__(self, net, sock, ssl_context, host=None, ssl_check_hostname=False):
-        self._ssl_context = ssl_context
-        server_hostname = host if ssl_check_hostname else None
-        sock = ssl_context.wrap_socket(
-            sock, server_hostname=server_hostname, do_handshake_on_connect=False)
+    DEFAULT_CONFIG = {
+        'ssl_context': None,
+        'ssl_check_hostname': True,
+        'ssl_cafile': None,
+        'ssl_certfile': None,
+        'ssl_keyfile': None,
+        'ssl_password': None,
+        'ssl_crlfile': None,
+    }
+    def __init__(self, net, sock, host=None, **configs):
+        self.ssl_config = copy.copy(self.DEFAULT_CONFIG)
+        for key in self.ssl_config:
+            if key in configs:
+                self.ssl_config[key] = configs[key]
+        self._ssl_context = self._build_ssl_context(self.ssl_config)
+        server_hostname = host.rstrip('.') if host is not None else None
+        sock = self._ssl_context.wrap_socket(
+            sock, server_hostname=server_hostname,
+            do_handshake_on_connect=False)
         super().__init__(net, sock, host=host)
 
+    @staticmethod
+    def _build_ssl_context(config):
+        if config['ssl_context'] is not None:
+            return config['ssl_context']
+        ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+        ctx.minimum_version = ssl.TLSVersion.TLSv1_2
+        ctx.check_hostname = config['ssl_check_hostname']
+        if config['ssl_cafile']:
+            ctx.load_verify_locations(config['ssl_cafile'])
+        else:
+            ctx.load_default_certs()
+        if config['ssl_certfile']:
+            ctx.load_cert_chain(
+                certfile=config['ssl_certfile'],
+                keyfile=config['ssl_keyfile'],
+                password=config['ssl_password'],
+            )
+        if config['ssl_crlfile']:
+            ctx.load_verify_locations(crl=config['ssl_crlfile'])
+            ctx.verify_flags |= ssl.VERIFY_CRL_CHECK_LEAF
+        return ctx
+
     async def handshake(self):
         while True:
             try:

kafka/version.py

@@ -1 +1 @@
-__version__ = '3.0.7'
+__version__ = '3.0.9'

{kafka_python-3.0.7.dist-info → kafka_python-3.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kafka-python
-Version: 3.0.7
+Version: 3.0.9
 Summary: Pure Python client for Apache Kafka
 Author-email: Dana Powers <dana.powers@gmail.com>
 License-Expression: Apache-2.0

{kafka_python-3.0.7.dist-info → kafka_python-3.0.9.dist-info}/RECORD

@@ -6,7 +6,7 @@ kafka/errors.py,sha256=9owgtTIcttdTCD1vAF9wz5jL9G72ljpR7M-vjLKEGvY,33206
 kafka/future.py,sha256=INmMIy2-BPxJ4zlw-V_i8Tj_OG9DMbyYyUEjOQ5pn_o,5440
 kafka/structs.py,sha256=ZOFmVJRbhSXykkw9cnuv-DGYE7g2KjaUGsytSOv4xVw,3146
 kafka/util.py,sha256=hvSdRbh5-IsUbpD_BqjabjEldtNmXufZH68b_xCkNjE,5194
-kafka/version.py,sha256=nrBN-YleEph5Asdo18FBZNm74FlORYq6jGrwHBllWIU,22
+kafka/version.py,sha256=GgzlXELdHTkTAUXqLnCAGFr2E0nwjjBPe-3RxfSkl6c,22
 kafka/admin/__init__.py,sha256=nTXg2CQo8Bydxsj80pVBzF2-jq4IhK7_gLnboeNWG60,1575
 kafka/admin/__main__.py,sha256=l5ujkHa3lBFEbKPCl7U0_pi6IIgj1IJfmB219vtcj50,69
 kafka/admin/_acls.py,sha256=QJlHguEM9t46qlABoQqTEDFQErDgG2RKwfV1NOKeKmU,13983
@@ -85,7 +85,7 @@ kafka/consumer/__init__.py,sha256=I7nuPUb103S1CvCqcudbIRG_isJbRgTXkK1mpHIhoVs,82
 kafka/consumer/__main__.py,sha256=bnxM30LbGVvLb0ZBcgJEt_8bZHADJpboHZCxzd8QEhA,72
 kafka/consumer/fetcher.py,sha256=Xr-JNlyNZgVNanh6AlYn1ImsyuBbpMqjPGwMZL50Hmc,106075
 kafka/consumer/group.py,sha256=lJo2U_wHSk_j-qwfa2GeU_gOZq5kWbxh2qAkjyMer6Q,68423
-kafka/consumer/subscription_state.py,sha256=0ixLOlO9KIxzFD0eMkLqrUjSJ44CMkkcvCQGWxt7nJg,40883
+kafka/consumer/subscription_state.py,sha256=tvuOTukWJz75Dy9uU0uhNqM5Gh3I4t04rPGsrmoXXpQ,41048
 kafka/coordinator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kafka/coordinator/base.py,sha256=UgMXWES0VVgDsvLEEZB8tAvchGFRzJFO6N9bL06vGm4,57794
 kafka/coordinator/consumer.py,sha256=cQ-zo0p_lL5H3j8DT4Q6ZrBBxCWWh4p1ub1X2IHlx5w,60186
@@ -131,11 +131,11 @@ kafka/net/compat.py,sha256=xBwWj5WgcfFbiPWy-46VCa25jDC9x5DOTl_ds_VXdyg,6415
 kafka/net/connection.py,sha256=gxUHGAESQneccx0JXY0apoxcsyL-XtMmryCJV4r_DOQ,26349
 kafka/net/http_connect.py,sha256=j8R1yLNwhTF-nQVMEgRF88mOF5-v1Sdj7uwkBvvg5PU,5133
 kafka/net/inet.py,sha256=zMo0NTCS7EY81uoNPri5ZHKcCnRVUIcCJiW6BeZWnCs,4730
-kafka/net/manager.py,sha256=bsgpwH_9nCC0hXvNrPfclF4rsvcqbzWOplSN_ATn9rY,21134
+kafka/net/manager.py,sha256=lpvu9ZmLh07ze0QlfVriLQ---3DNotW1VmdJw-FiG58,20283
 kafka/net/metrics.py,sha256=-cdWXQtonCO7-LpovLoEcWM-_3R9sAtyQxWf_QHOAWE,7299
 kafka/net/selector.py,sha256=kKKhVA6UdyiTNAnRDlRJNA3rC-C0anUcpYHnQy_yRZQ,29333
 kafka/net/socks5.py,sha256=euTwJl2avRmCJhVKyGmhZWInqgY6MNHPA1Tz2f2J1Z0,10361
-kafka/net/transport.py,sha256=Loa43s09X-VVrNiHggdfzNIDrok4dHlR8LptY3b0yAw,15974
+kafka/net/transport.py,sha256=W6ne_UGPldoYMJ-7KOxksAfswSyLRbjqeSMctr5WGhE,17285
 kafka/net/wakeup_notifier.py,sha256=gLnfg-HEjVS5J9p-7kZfZpIeLT0AjvK5MOc6EMj3R88,2783
 kafka/net/sasl/__init__.py,sha256=vKE2jkS_BZ2OEVANlXZhW2xIVvH5C1o2kCxugw2PfYY,1006
 kafka/net/sasl/abc.py,sha256=H3tHUPevoaQdS395_ID88Wxhwvc8XjOTcAP8dKXxO9I,547
@@ -365,9 +365,9 @@ kafka/serializer/default.py,sha256=ZKzTWlG9N4vS3QXovFLygNVrnjAcMZKS0RE4OvQ6DL4,4
 kafka/serializer/json.py,sha256=lErgU66KZGf33hofwlObYIaxLDk9gcolhy_rlcOuf8Y,469
 kafka/serializer/wrapper.py,sha256=RGXFj-PXQyL3rdMXI9ACaohRa6Kg5SHOZTRruU9jluM,485
 kafka/vendor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kafka_python-3.0.7.dist-info/licenses/LICENSE,sha256=vxnoJsqm6bKl3ZWdI1Q7Ikw_k9cOvO3vcvZNsY_1fP8,11374
-kafka_python-3.0.7.dist-info/METADATA,sha256=qIDuv8vtC5xCXcx0W6Lor0EXAGSUmJIeRqKClE175qw,11590
-kafka_python-3.0.7.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-kafka_python-3.0.7.dist-info/entry_points.txt,sha256=LQvqZj3uM785ainO5HrXmukbjSrK-oPqrESqpvoR-As,51
-kafka_python-3.0.7.dist-info/top_level.txt,sha256=IivJz7l5WHdLNDT6RIiVAlhjQzYRwGqBBmKHZ7WjPeM,6
-kafka_python-3.0.7.dist-info/RECORD,,
+kafka_python-3.0.9.dist-info/licenses/LICENSE,sha256=vxnoJsqm6bKl3ZWdI1Q7Ikw_k9cOvO3vcvZNsY_1fP8,11374
+kafka_python-3.0.9.dist-info/METADATA,sha256=U5mlZjtU_Jvj2x6XgUZoC04O17_xE_7s9CMVnEDNzG0,11590
+kafka_python-3.0.9.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+kafka_python-3.0.9.dist-info/entry_points.txt,sha256=LQvqZj3uM785ainO5HrXmukbjSrK-oPqrESqpvoR-As,51
+kafka_python-3.0.9.dist-info/top_level.txt,sha256=IivJz7l5WHdLNDT6RIiVAlhjQzYRwGqBBmKHZ7WjPeM,6
+kafka_python-3.0.9.dist-info/RECORD,,

{kafka_python-3.0.7.dist-info → kafka_python-3.0.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.1)
+Generator: setuptools (83.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any