Merge branch 'master' of git://github.com/mattrobenolt/redis-py into …

…mattrobenolt-master Conflicts: redis/exceptions.py
path · Mar 28, 2013 · 8063b10 · 8063b10
2 parents ba7b768 + 4a783ba
commit 8063b10
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/redis/exceptions.py b/redis/exceptions.py
@@ -8,16 +8,16 @@ class RedisError(Exception):
 class AuthenticationError(RedisError):
     pass
 
-
-class ConnectionError(RedisError):
+class ServerError(RedisError):
     pass
 
-
-class ResponseError(RedisError):
+class ConnectionError(ServerError):
     pass
 
+class InvalidResponse(ServerError):
+    pass
 
-class InvalidResponse(RedisError):
+class ResponseError(RedisError):
     pass