summaryrefslogtreecommitdiff
path: root/kafka/consumer/simple.py
diff options
context:
space:
mode:
authorDana Powers <dana.powers@gmail.com>2016-08-01 18:14:25 -0700
committerGitHub <noreply@github.com>2016-08-01 18:14:25 -0700
commit99891adfa0b4e6baa0877c50e7fb2d3951ec5b39 (patch)
tree6565c3cb4566c95c7b69a02178065aef74e9674d /kafka/consumer/simple.py
parentec286c9fb6a49b20a3cdce473b03b55fe43d0e43 (diff)
parent51b3d311f3930d9bb86877ca235156eb9d46763c (diff)
downloadkafka-python-99891adfa0b4e6baa0877c50e7fb2d3951ec5b39.tar.gz
Merge pull request #785 from dpkp/six
Vendor python module six; move selectors34 and socketpair under kafka.vendor
Diffstat (limited to 'kafka/consumer/simple.py')
-rw-r--r--kafka/consumer/simple.py4
1 files changed, 2 insertions, 2 deletions
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,