Revision 062b1d0a kamaki/clients/__init__.py

b/kamaki/clients/__init__.py
42 42
class ClientError(Exception):
43 43
    def __init__(self, message, status=0, details=[]):
44 44
        try:
45
            json_msg = loads(message)
45
            serv_stat, sep, new_msg = message.partition('{')
46
            new_msg = sep + new_msg
47
            json_msg = loads(new_msg)
46 48
            key = json_msg.keys()[0]
49

  
47 50
            json_msg = json_msg[key]
48
            message = '%s (%s)\n' % (key, json_msg['message'])\
49
                if 'message' in json_msg else '%s' % key
51
            message = '%s %s (%s)\n' % (serv_stat, key, json_msg['message'])\
52
                if 'message' in json_msg else '%s %s' % (serv_stat, key)
50 53
            if 'code' in json_msg:
51 54
                status = json_msg['code']
52 55
            if 'details' in json_msg:

Also available in: Unified diff