Skip to content

Commit 51b3d31

Browse files
dpkpdpkp
committed
Vendor six 1.10.0
1 parent 1d23ddd commit 51b3d31

25 files changed

+899
-27
lines changed

‎kafka/client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import random
66
import time
77

8-
import six
8+
from kafka.vendor import six
99

1010
import kafka.errors
1111
from kafka.errors import (UnknownError, ConnectionError, FailedPayloadsError,

‎kafka/client_async.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import socket
1919
import time
2020

21-
import six
21+
from kafka.vendor import six
2222

2323
from .cluster import ClusterMetadata
2424
from .conn import BrokerConnection, ConnectionStates, collect_hosts, get_ip_port_afi

‎kafka/cluster.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import threading
77
import time
88

9-
import six
9+
from kafka.vendor import six
1010

1111
from . import errors as Errors
1212
from .future import Future

‎kafka/codec.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
from __future__ import absolute_import
2+
13
import gzip
24
import io
35
import platform
46
import struct
57

6-
import six
7-
from six.moves import xrange
8+
from kafka.vendor import six
9+
from kafka.vendor.six.moves import xrange # pylint: disable=import-error
810

911
_XERIAL_V1_HEADER = (-126, b'S', b'N', b'A', b'P', b'P', b'Y', 0, 1, 1)
1012
_XERIAL_V1_FORMAT = 'bccccccBii'

‎kafka/conn.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import ssl
99
import time
1010

11-
import six
11+
from kafka.vendor import six
1212

1313
import kafka.errors as Errors
1414
from kafka.future import Future

‎kafka/consumer/fetcher.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import random
77
import time
88

9-
import six
9+
from kafka.vendor import six
1010

1111
import kafka.errors as Errors
1212
from kafka.future import Future

‎kafka/consumer/group.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import socket
66
import time
77

8-
import six
8+
from kafka.vendor import six
99

1010
from kafka.client_async import KafkaClient, selectors
1111
from kafka.consumer.fetcher import Fetcher

‎kafka/consumer/multiprocess.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import time
77
import warnings
88

9-
from six.moves import queue
9+
from kafka.vendor.six.moves import queue # pylint: disable=import-error
1010

1111
from ..common import KafkaError
1212
from .base import (

‎kafka/consumer/simple.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import time
1010
import warnings
1111

12-
import six
13-
from six.moves import queue
12+
from kafka.vendor import six
13+
from kafka.vendor.six.moves import queue # pylint: disable=import-error
1414

1515
from .base import (
1616
Consumer,

‎kafka/consumer/subscription_state.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import logging
55
import re
66

7-
import six
7+
from kafka.vendor import six
88

99
from kafka.errors import IllegalStateError
1010
from kafka.protocol.offset import OffsetResetStrategy

‎kafka/coordinator/assignors/range.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import collections
22
import logging
33

4-
import six
4+
from kafka.vendor import six
55

66
from .abstract import AbstractPartitionAssignor
77
from ..protocol import ConsumerProtocolMemberMetadata, ConsumerProtocolMemberAssignment

‎kafka/coordinator/assignors/roundrobin.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import itertools
33
import logging
44

5-
import six
5+
from kafka.vendor import six
66

77
from .abstract import AbstractPartitionAssignor
88
from ...common import TopicPartition

‎kafka/coordinator/base.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import time
77
import weakref
88

9-
import six
9+
from kafka.vendor import six
1010

1111
from .heartbeat import Heartbeat
1212
from .. import errors as Errors

‎kafka/coordinator/consumer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import time
77
import weakref
88

9-
import six
9+
from kafka.vendor import six
1010

1111
from .base import BaseCoordinator
1212
from .assignors.range import RangePartitionAssignor

‎kafka/partitioner/hashed.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import six
1+
from __future__ import absolute_import
2+
3+
from kafka.vendor import six
24

35
from .base import Partitioner
46

‎kafka/producer/base.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from threading import Thread, Event
1414

15-
import six
15+
from kafka.vendor import six
1616

1717
from kafka.structs import (
1818
ProduceRequestPayload, ProduceResponsePayload, TopicPartition, RetryOptions)

‎kafka/producer/sender.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import threading
77
import time
88

9-
import six
9+
from kafka.vendor import six
1010

1111
from .. import errors as Errors
1212
from ..metrics.measurable import AnonMeasurable

‎kafka/producer/simple.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import logging
55
import random
66

7-
from six.moves import xrange
7+
from kafka.vendor.six.moves import xrange # pylint: disable=import-error
88

99
from .base import Producer
1010

‎kafka/protocol/legacy.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import logging
44
import struct
55

6-
import six
6+
from kafka.vendor import six # pylint: disable=import-error
77

8-
from six.moves import xrange
8+
from kafka.vendor.six.moves import xrange # pylint: disable=import-error
99

1010
import kafka.protocol.commit
1111
import kafka.protocol.fetch

‎kafka/util.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from threading import Thread, Event
77
import weakref
88

9-
import six
9+
from kafka.vendor import six
1010

1111
from kafka.errors import BufferUnderflowError
1212

‎kafka/vendor/selectors34.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
1313
The following code adapted from trollius.selectors.
1414
"""
15-
15+
from __future__ import absolute_import
1616

1717
from abc import ABCMeta, abstractmethod
1818
from collections import namedtuple, Mapping
@@ -21,7 +21,7 @@
2121
import select
2222
import sys
2323

24-
import six
24+
from kafka.vendor import six
2525

2626

2727
def _wrap_error(exc, mapping, key):

0 commit comments

Comments
 (0)