diff options
| author | andy <andy@andymccurdy.com> | 2011-10-10 10:42:28 -0700 |
|---|---|---|
| committer | andy <andy@andymccurdy.com> | 2011-10-10 10:42:28 -0700 |
| commit | 18a79c02bfbbbc320e180ac22b366da2d3a84e3e (patch) | |
| tree | 4bec71aa5ffae605ddff9c8b77e732a641b5a89e | |
| parent | 1dee2a3774738236746936dcd9b03787f4d47a57 (diff) | |
| parent | 45932cdfd3aedc703704d63db7ee7fc04aaf132f (diff) | |
| download | redis-py-18a79c02bfbbbc320e180ac22b366da2d3a84e3e.tar.gz | |
Merge branch 'master' of github.com:andymccurdy/redis-py
| -rw-r--r-- | redis/client.py | 6 | ||||
| -rw-r--r-- | redis/connection.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/redis/client.py b/redis/client.py index 4191c5e..4ab869e 100644 --- a/redis/client.py +++ b/redis/client.py @@ -115,13 +115,13 @@ class StrictRedis(object): RESPONSE_CALLBACKS = dict_merge( string_keys_to_dict( 'AUTH DEL EXISTS EXPIRE EXPIREAT HDEL HEXISTS HMSET MOVE MSETNX ' - 'PERSIST RENAMENX SADD SISMEMBER SMOVE SETEX SETNX SREM ZADD ZREM', + 'PERSIST RENAMENX SISMEMBER SMOVE SETEX SETNX SREM ZREM', bool ), string_keys_to_dict( - 'DECRBY GETBIT HLEN INCRBY LINSERT LLEN LPUSHX RPUSHX SCARD ' + 'DECRBY GETBIT HLEN INCRBY LINSERT LLEN LPUSHX RPUSHX SCARD' 'SDIFFSTORE SETBIT SETRANGE SINTERSTORE STRLEN SUNIONSTORE ZCARD ' - 'ZREMRANGEBYRANK ZREMRANGEBYSCORE', + 'ZREMRANGEBYRANK ZREMRANGEBYSCORE ZADD SADD', int ), string_keys_to_dict( diff --git a/redis/connection.py b/redis/connection.py index 79f767e..61403a4 100644 --- a/redis/connection.py +++ b/redis/connection.py @@ -79,6 +79,8 @@ class HiredisParser(object): self._reader = None def read_response(self): + if not self._reader: + raise ConnectionError("Socket closed on remote end") response = self._reader.gets() while response is False: try: |