1 files changed, 6 insertions, 0 deletions
diff --git a/redis/client.py b/redis/client.py
index 93da07c..0486022 100755
--- a/redis/client.py
+++ b/redis/client.py
@@ -3339,6 +3339,12 @@ class PubSub(object):
             ]
         self.reset()
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.reset()
+
     def __del__(self):
         try:
             # if this object went out of scope prior to shutting down