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/client_async.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/client_async.py')
| -rw-r--r-- | kafka/client_async.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kafka/client_async.py b/kafka/client_async.py index 6bffa9e..dd4df82 100644 --- a/kafka/client_async.py +++ b/kafka/client_async.py @@ -13,12 +13,12 @@ try: import selectors # pylint: disable=import-error except ImportError: # vendored backport module - from . import selectors34 as selectors + from .vendor import selectors34 as selectors import socket import time -import six +from kafka.vendor import six from .cluster import ClusterMetadata from .conn import BrokerConnection, ConnectionStates, collect_hosts, get_ip_port_afi @@ -28,7 +28,7 @@ from .metrics.stats import Avg, Count, Rate from .metrics.stats.rate import TimeUnit from .protocol.metadata import MetadataRequest from .protocol.produce import ProduceRequest -from . import socketpair +from .vendor import socketpair from .version import __version__ if six.PY2: |