diff options
| -rw-r--r-- | redis/_compat.py | 10 | ||||
| -rw-r--r-- | redis/client.py | 4 | ||||
| -rw-r--r-- | tests/server_commands.py | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/redis/_compat.py b/redis/_compat.py index 9d59742..564ade7 100644 --- a/redis/_compat.py +++ b/redis/_compat.py @@ -12,8 +12,8 @@ if sys.version_info[0] < 3: from StringIO import StringIO as BytesIO iteritems = lambda x: x.iteritems() - dictkeys = lambda x: x.keys() - dictvalues = lambda x: x.values() + iterkeys = lambda x: x.iterkeys() + itervalues = lambda x: x.itervalues() nativestr = lambda x: \ x if isinstance(x, str) else x.encode('utf-8', 'replace') u = lambda x: x.decode() @@ -31,9 +31,9 @@ else: from io import BytesIO from string import ascii_letters - iteritems = lambda x: x.items() - dictkeys = lambda x: list(x.keys()) - dictvalues = lambda x: list(x.values()) + iteritems = lambda x: iter(x.items()) + iterkeys = lambda x: iter(x.keys()) + itervalues = lambda x: iter(x.values()) byte_to_chr = lambda x: chr(x) nativestr = lambda x: \ x if isinstance(x, str) else x.decode('utf-8', 'replace') diff --git a/redis/client.py b/redis/client.py index 033fd3d..2aab306 100644 --- a/redis/client.py +++ b/redis/client.py @@ -4,7 +4,7 @@ import datetime import sys import warnings import time as mod_time -from redis._compat import (b, izip, imap, iteritems, dictkeys, dictvalues, +from redis._compat import (b, izip, imap, iteritems, iterkeys, itervalues, basestring, long, nativestr, urlparse, bytes) from redis.connection import ConnectionPool, UnixDomainSocketConnection from redis.exceptions import ( @@ -1298,7 +1298,7 @@ class StrictRedis(object): def _zaggregate(self, command, dest, keys, aggregate=None): pieces = [command, dest, len(keys)] if isinstance(keys, dict): - keys, weights = dictkeys(keys), dictvalues(keys) + keys, weights = iterkeys(keys), itervalues(keys) else: weights = None pieces.extend(keys) diff --git a/tests/server_commands.py b/tests/server_commands.py index c4b0fc9..1ae8f80 100644 --- a/tests/server_commands.py +++ b/tests/server_commands.py @@ -4,8 +4,8 @@ import datetime import time import binascii -from redis._compat import (unichr, u, b, ascii_letters, iteritems, dictkeys, - dictvalues) +from redis._compat import (unichr, u, b, ascii_letters, iteritems, iterkeys, + itervalues) from redis.client import parse_info import redis @@ -1522,7 +1522,7 @@ class ServerCommandsTestCase(unittest.TestCase): # real logic h = {b('a1'): b('1'), b('a2'): b('2'), b('a3'): b('3')} self.make_hash('a', h) - keys = dictkeys(h) + keys = list(iterkeys(h)) keys.sort() remote_keys = self.client.hkeys('a') remote_keys.sort() @@ -1551,7 +1551,7 @@ class ServerCommandsTestCase(unittest.TestCase): # real logic h = {b('a1'): b('1'), b('a2'): b('2'), b('a3'): b('3')} self.make_hash('a', h) - vals = dictvalues(h) + vals = list(itervalues(h)) vals.sort() remote_vals = self.client.hvals('a') remote_vals.sort() @@ -1782,10 +1782,10 @@ class ServerCommandsTestCase(unittest.TestCase): # check that KEYS returns all the keys as they are self.assertEqual(sorted(self.client.keys('*')), - sorted(dictkeys(mapping))) + sorted(list(iterkeys(mapping)))) # check that it is possible to get list content by key name - for key in dictkeys(mapping): + for key in iterkeys(mapping): self.assertEqual(self.client.lrange(key, 0, -1), mapping[key]) |