ResponseError raising is fixed

jorgebastida · Apr 13, 2011 · 1605c75 · 1605c75
1 parent f98f7ff
commit 1605c75
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/brukva/client.py b/brukva/client.py
@@ -322,7 +322,7 @@ def format_reply(self, cmd_line, data):
         except Exception, e:
             raise ResponseError(
                 'failed to format reply to %s, raw data: %s; err message: %s' %
-                cmd_line, data, e
+                (cmd_line, data, e), cmd_line
             )
         return res
     ####
@@ -396,9 +396,7 @@ def process_data(self, data, cmd_line, callback):
                         tail = tail[4:]
                     response = ResponseError(tail, cmd_line)
                 else:
-                    raise ResponseError('Unknown response type %s' %
-                        (head, cmd_line)
-                    )
+                    raise ResponseError('Unknown response type %s' % head, cmd_line)
 
             callback(response)
 
@@ -412,7 +410,7 @@ def consume_multibulk(self, length, cmd_line, callback):
                 if not data:
                     raise ResponseError(
                         'Not enough data in response to %s, accumulated tokens: %s'%
-                        (cmd_line, tokens)
+                        (cmd_line, tokens), cmd_line
                     )
                 token = yield self.process_data(data, cmd_line) #FIXME error
                 tokens.append( token )
@@ -426,7 +424,7 @@ def consume_bulk(self, length, callback):
             if isinstance(data, Exception):
                 raise data
             if not data:
-                raise ResponseError('EmptyResponse')
+                raise ResponseError('EmptyResponse', None)
             else:
                 data = data[:-2]
             callback(data)
@@ -892,7 +890,7 @@ def execute(self, callbacks):
             while len(responses) < total:
                 data = yield async(self.connection.readline)()
                 if not data:
-                    raise ResponseError('Not enough data after EXEC')
+                    raise ResponseError('Not enough data after EXEC', None)
 
                 try:
                     cmd_line = cmds.next()

diff --git a/brukva/exceptions.py b/brukva/exceptions.py
@@ -12,7 +12,9 @@ def __init__(self, message, cmd_line):
         self.cmd_line = cmd_line
 
     def __repr__(self):
-        return 'ResponseError (on %s [%s, %s]): %s' % (self.cmd_line.cmd, self.cmd_line.args, self.cmd_line.kwargs, self.message)
+        if self.cmd_line:
+            return 'ResponseError (on %s [%s, %s]): %s' % (self.cmd_line.cmd, self.cmd_line.args, self.cmd_line.kwargs, self.message)
+        return 'ResponseError: %s' % self.message
 
     __str__ = __repr__