1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
Description: Fix six imports
Author: Thomas Goirand <zigo@debian.org>
Forwarded: no
Last-Update: 2024-04-18
Index: python-kafka/kafka/codec.py
===================================================================
--- python-kafka.orig/kafka/codec.py
+++ python-kafka/kafka/codec.py
@@ -5,8 +5,8 @@ import io
import platform
import struct
-from kafka.vendor import six
-from kafka.vendor.six.moves import range
+import six
+from six.moves import range
_XERIAL_V1_HEADER = (-126, b'S', b'N', b'A', b'P', b'P', b'Y', 0, 1, 1)
_XERIAL_V1_FORMAT = 'bccccccBii'
Index: python-kafka/test/fixtures.py
===================================================================
--- python-kafka.orig/test/fixtures.py
+++ python-kafka/test/fixtures.py
@@ -10,8 +10,8 @@ import time
import uuid
import py
-from kafka.vendor.six.moves import urllib, range
-from kafka.vendor.six.moves.urllib.parse import urlparse # pylint: disable=E0611,F0401
+from six.moves import urllib, range
+from six.moves.urllib.parse import urlparse # pylint: disable=E0611,F0401
from kafka import errors, KafkaAdminClient, KafkaClient, KafkaConsumer, KafkaProducer
from kafka.errors import InvalidReplicationFactorError
Index: python-kafka/test/test_consumer_integration.py
===================================================================
--- python-kafka.orig/test/test_consumer_integration.py
+++ python-kafka/test/test_consumer_integration.py
@@ -3,7 +3,7 @@ import time
from mock import patch
import pytest
-from kafka.vendor.six.moves import range
+from six.moves import range
import kafka.codec
from kafka.errors import UnsupportedCodecError, UnsupportedVersionError
Index: python-kafka/test/test_codec.py
===================================================================
--- python-kafka.orig/test/test_codec.py
+++ python-kafka/test/test_codec.py
@@ -4,7 +4,7 @@ import platform
import struct
import pytest
-from kafka.vendor.six.moves import range
+from six.moves import range
from kafka.codec import (
has_snappy, has_lz4, has_zstd,
Index: python-kafka/test/test_assignors.py
===================================================================
--- python-kafka.orig/test/test_assignors.py
+++ python-kafka/test/test_assignors.py
@@ -11,7 +11,7 @@ from kafka.coordinator.assignors.range i
from kafka.coordinator.assignors.roundrobin import RoundRobinPartitionAssignor
from kafka.coordinator.assignors.sticky.sticky_assignor import StickyPartitionAssignor, StickyAssignorUserDataV1
from kafka.coordinator.protocol import ConsumerProtocolMemberAssignment, ConsumerProtocolMemberMetadata
-from kafka.vendor import six
+import six
@pytest.fixture(autouse=True)
Index: python-kafka/test/test_consumer_group.py
===================================================================
--- python-kafka.orig/test/test_consumer_group.py
+++ python-kafka/test/test_consumer_group.py
@@ -4,7 +4,7 @@ import threading
import time
import pytest
-from kafka.vendor import six
+import six
from kafka.conn import ConnectionStates
from kafka.consumer.group import KafkaConsumer
|
