summaryrefslogtreecommitdiff
path: root/kafka/consumer
diff options
context:
space:
mode:
authorDana Powers <dana.powers@gmail.com>2016-08-01 09:45:39 -0700
committerDana Powers <dana.powers@gmail.com>2016-08-01 14:47:40 -0700
commit51b3d311f3930d9bb86877ca235156eb9d46763c (patch)
tree04b372187509236d6235da5e2a5076345ebf5365 /kafka/consumer
parent1d23dddcd6f2572653bbeec2e0e0608fdb9e7b11 (diff)
downloadkafka-python-six.tar.gz
Vendor six 1.10.0six
Diffstat (limited to 'kafka/consumer')
-rw-r--r--kafka/consumer/fetcher.py2
-rw-r--r--kafka/consumer/group.py2
-rw-r--r--kafka/consumer/multiprocess.py2
-rw-r--r--kafka/consumer/simple.py4
-rw-r--r--kafka/consumer/subscription_state.py2
5 files changed, 6 insertions, 6 deletions
diff --git a/kafka/consumer/fetcher.py b/kafka/consumer/fetcher.py
index 66b6df0..c00681d 100644
--- a/kafka/consumer/fetcher.py
+++ b/kafka/consumer/fetcher.py
@@ -6,7 +6,7 @@ import logging
import random
import time
-import six
+from kafka.vendor import six
import kafka.errors as Errors
from kafka.future import Future
diff --git a/kafka/consumer/group.py b/kafka/consumer/group.py
index fcd5ede..8325f9c 100644
--- a/kafka/consumer/group.py
+++ b/kafka/consumer/group.py
@@ -5,7 +5,7 @@ import logging
import socket
import time
-import six
+from kafka.vendor import six
from kafka.client_async import KafkaClient, selectors
from kafka.consumer.fetcher import Fetcher
diff --git a/kafka/consumer/multiprocess.py b/kafka/consumer/multiprocess.py
index fddb269..58e3e07 100644
--- a/kafka/consumer/multiprocess.py
+++ b/kafka/consumer/multiprocess.py
@@ -6,7 +6,7 @@ from multiprocessing import Process, Manager as MPManager
import time
import warnings
-from six.moves import queue
+from kafka.vendor.six.moves import queue # pylint: disable=import-error
from ..common import KafkaError
from .base import (
diff --git a/kafka/consumer/simple.py b/kafka/consumer/simple.py
index 3de0dee..f5b6a99 100644
--- a/kafka/consumer/simple.py
+++ b/kafka/consumer/simple.py
@@ -9,8 +9,8 @@ import sys
import time
import warnings
-import six
-from six.moves import queue
+from kafka.vendor import six
+from kafka.vendor.six.moves import queue # pylint: disable=import-error
from .base import (
Consumer,
diff --git a/kafka/consumer/subscription_state.py b/kafka/consumer/subscription_state.py
index fa09a06..a480a9b 100644
--- a/kafka/consumer/subscription_state.py
+++ b/kafka/consumer/subscription_state.py
@@ -4,7 +4,7 @@ import abc
import logging
import re
-import six
+from kafka.vendor import six
from kafka.errors import IllegalStateError
from kafka.protocol.offset import OffsetResetStrategy