diff options
| author | Andy McCurdy <andy@andymccurdy.com> | 2011-05-12 02:57:44 -0700 |
|---|---|---|
| committer | Andy McCurdy <andy@andymccurdy.com> | 2011-05-12 02:57:44 -0700 |
| commit | 1685fd2f3e780c17c3bcb866ea60b6e94d8efec1 (patch) | |
| tree | 3d0330026e79d986a9af8781c1971086fca4db8c | |
| parent | 4d6320a1666972e90f4225bd5d26fd4afad21099 (diff) | |
| download | redis-py-1685fd2f3e780c17c3bcb866ea60b6e94d8efec1.tar.gz | |
we don't need the command_name overriding just yet
| -rw-r--r-- | redis/client.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/redis/client.py b/redis/client.py index 5eb964f..d014bd1 100644 --- a/redis/client.py +++ b/redis/client.py @@ -228,7 +228,7 @@ class Redis(threading.local): #### COMMAND EXECUTION AND PROTOCOL PARSING #### def execute_command(self, *args, **options): - command_name = options.get('command_name', args[0]) + command_name = args[0] subscription_command = command_name in self.SUBSCRIPTION_COMMANDS if self.subscribed and not subscription_command: raise PubSubError("Cannot issue commands other than SUBSCRIBE and " @@ -1298,7 +1298,7 @@ class Pipeline(Redis): for r, cmd in izip(response, commands): if not isinstance(r, Exception): args, options = cmd - command_name = options.get('command_name', args[0]) + command_name = args[0] if command_name in self.RESPONSE_CALLBACKS: r = self.RESPONSE_CALLBACKS[command_name](r, **options) data.append(r) @@ -1309,8 +1309,7 @@ class Pipeline(Redis): all_cmds = ''.join(starmap(self.connection.pack_command, [args for args, options in commands])) self.connection.send_packed_command(all_cmds) - return [self.parse_response( - options.get('command_name', args[0]), **options) + return [self.parse_response(args[0], **options) for args, options in commands] def execute(self): |