summaryrefslogtreecommitdiff
path: root/redis/client.py
diff options
context:
space:
mode:
authorAndy McCurdy <andy@andymccurdy.com>2010-06-24 12:02:51 -0700
committerAndy McCurdy <andy@andymccurdy.com>2010-06-24 12:02:51 -0700
commitea8769b10fa0db70ddf3ea97ee6f682174cbe6ca (patch)
tree424956494c0c6f037ce7fdf1341e31f83e93ffb7 /redis/client.py
parentfb0a249f4a39268e089825a15184d3d1b7ddac62 (diff)
downloadredis-py-ea8769b10fa0db70ddf3ea97ee6f682174cbe6ca.tar.gz
Small change to pubsub, hopefully fixing #49, or at least making it a little more sane
Diffstat (limited to 'redis/client.py')
-rw-r--r--redis/client.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/redis/client.py b/redis/client.py
index 6405947..41a9660 100644
--- a/redis/client.py
+++ b/redis/client.py
@@ -1203,10 +1203,15 @@ class Redis(threading.local):
'data': r[3]
}
else:
- msg = {'type': r[0], 'channel': r[1], 'data': r[2]}
- yield msg
+ msg = {
+ 'type': r[0],
+ 'pattern': None,
+ 'channel': r[1],
+ 'data': r[2]
+ }
if r[0] == 'unsubscribe' and r[2] == 0:
self.subscribed = False
+ yield msg
class Pipeline(Redis):