diff options
| author | Dana Powers <dana.powers@gmail.com> | 2016-08-01 18:14:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-01 18:14:25 -0700 |
| commit | 99891adfa0b4e6baa0877c50e7fb2d3951ec5b39 (patch) | |
| tree | 6565c3cb4566c95c7b69a02178065aef74e9674d /kafka/conn.py | |
| parent | ec286c9fb6a49b20a3cdce473b03b55fe43d0e43 (diff) | |
| parent | 51b3d311f3930d9bb86877ca235156eb9d46763c (diff) | |
| download | kafka-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/conn.py')
| -rw-r--r-- | kafka/conn.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kafka/conn.py b/kafka/conn.py index da98028..42bfa60 100644 --- a/kafka/conn.py +++ b/kafka/conn.py @@ -8,7 +8,7 @@ import socket import ssl import time -import six +from kafka.vendor import six import kafka.errors as Errors from kafka.future import Future |