summaryrefslogtreecommitdiff
path: root/kafka/cluster.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/cluster.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/cluster.py')
-rw-r--r--kafka/cluster.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/kafka/cluster.py b/kafka/cluster.py
index 694e115..b7c0135 100644
--- a/kafka/cluster.py
+++ b/kafka/cluster.py
@@ -6,7 +6,7 @@ import logging
import threading
import time
-import six
+from kafka.vendor import six
from . import errors as Errors
from .future import Future