summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandall Leeds <randall.leeds@gmail.com>2011-07-11 19:24:13 -0700
committerRandall Leeds <randall.leeds@gmail.com>2011-07-11 19:26:02 -0700
commit9e918fdb481aef700561592121322a3a82072f72 (patch)
treed4f603337bcf93f3e9a62ff26d16cc9668738dc6
parent4bc9b77431955ba317318410ce70f9b38367ee3a (diff)
downloadredis-py-9e918fdb481aef700561592121322a3a82072f72.tar.gz
Don't mask ConnectionError in Pipeline.execute()
-rw-r--r--redis/client.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/redis/client.py b/redis/client.py
index 21f490e..a58dc9e 100644
--- a/redis/client.py
+++ b/redis/client.py
@@ -1342,10 +1342,10 @@ class Pipeline(Redis):
return execute(conn, stack)
except ConnectionError:
conn.disconnect()
- # if we watching a variable, the watch is no longer valid since
- # this conncetion has died.
+ # if we were watching a variable, the watch is no longer valid since
+ # this connection has died.
if self.watching:
- raise WatchError("Watched variable changed.")
+ raise
return execute(conn, stack)
finally:
self.reset()