summaryrefslogtreecommitdiff
path: root/redis/connection.py
diff options
context:
space:
mode:
authorChris Simpson <cjsimpson@gmail.com>2016-06-12 18:35:47 -0400
committerChris Simpson <cjsimpson@gmail.com>2016-06-12 18:35:47 -0400
commitcb15dfcfa126f5e623b98c6bdf017941bf084cef (patch)
treec0c3800cc508e9b8f2d068581576c000e08f292c /redis/connection.py
parent360c2124554b1056299c54850771d0cd28241450 (diff)
parent3bdf81ab41464d8e918080234912fc8fd86629af (diff)
downloadredis-py-cb15dfcfa126f5e623b98c6bdf017941bf084cef.tar.gz
Merge branch 'master' of https://github.com/andymccurdy/redis-py
Diffstat (limited to 'redis/connection.py')
-rwxr-xr-xredis/connection.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/redis/connection.py b/redis/connection.py
index a552820..f0e28e3 100755
--- a/redis/connection.py
+++ b/redis/connection.py
@@ -1,7 +1,6 @@
from __future__ import with_statement
from distutils.version import StrictVersion
from itertools import chain
-from select import select
import os
import socket
import sys
@@ -17,7 +16,7 @@ except ImportError:
from redis._compat import (b, xrange, imap, byte_to_chr, unicode, bytes, long,
BytesIO, nativestr, basestring, iteritems,
LifoQueue, Empty, Full, urlparse, parse_qs,
- recv, recv_into, unquote)
+ recv, recv_into, select, unquote)
from redis.exceptions import (
RedisError,
ConnectionError,