diff options
| -rw-r--r-- | redis/_compat.py | 2 | ||||
| -rwxr-xr-x | redis/client.py | 2 | ||||
| -rwxr-xr-x | redis/connection.py | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/redis/_compat.py b/redis/_compat.py index 80973b3..c9213a6 100644 --- a/redis/_compat.py +++ b/redis/_compat.py @@ -112,7 +112,6 @@ if sys.version_info[0] < 3: xrange = xrange basestring = basestring unicode = unicode - bytes = str long = long else: from urllib.parse import parse_qs, unquote, urlparse @@ -142,7 +141,6 @@ else: basestring = str unicode = str safe_unicode = str - bytes = bytes long = int try: # Python 3 diff --git a/redis/client.py b/redis/client.py index 3411486..2645e83 100755 --- a/redis/client.py +++ b/redis/client.py @@ -7,7 +7,7 @@ import time import threading import time as mod_time import hashlib -from redis._compat import (basestring, bytes, imap, iteritems, iterkeys, +from redis._compat import (basestring, imap, iteritems, iterkeys, itervalues, izip, long, nativestr, safe_unicode) from redis.connection import (ConnectionPool, UnixDomainSocketConnection, SSLConnection, Token) diff --git a/redis/connection.py b/redis/connection.py index 9b949c5..ea06241 100755 --- a/redis/connection.py +++ b/redis/connection.py @@ -14,7 +14,7 @@ try: except ImportError: ssl_available = False -from redis._compat import (xrange, imap, byte_to_chr, unicode, bytes, long, +from redis._compat import (xrange, imap, byte_to_chr, unicode, long, nativestr, basestring, iteritems, LifoQueue, Empty, Full, urlparse, parse_qs, recv, recv_into, select, unquote) |