Revision 0238c167 kamaki/clients/connection/kamakicon.py

b/kamaki/clients/connection/kamakicon.py
36 36 
from synnefo.lib.pool.http import get_http_connection
37 37 
from kamaki.clients.connection import HTTPConnection, HTTPResponse
38 38 
from kamaki.clients.connection.errors import HTTPConnectionError
39 
from kamaki.clients.connection.errors import HTTPResponseFormatError
39 
from kamaki.clients.connection.errors import HTTPResponseError
40 40 
from socket import gaierror
41 41 

  		





  42
  42
  
    
from json import loads


  		





  ......




  84
  84
  
    
        try:


  		





  85
  85
  
    
            return loads(self._content)


  		





  86
  86
  
    
        except ValueError as err:


  		





  87
  
  
    
            HTTPResponseFormatError('Response not formated in JSON - %s' % err)


  		





  
  87
  
    
            HTTPResponseError('Response not formated in JSON - %s' % err)


  		





  88
  88
  
    

  		





  89
  89
  
    
    @json.setter


  		





  90
  90
  
    
    def json(self, v):


  		





  ......




  148
  148
  
    
            conn.close()


  		





  149
  149
  
    
            if isinstance(err, gaierror):


  		





  150
  150
  
    
                raise HTTPConnectionError(


  		





  151
  
  
    
                    'Cannot connect to %s - %s' % (self.url, err),


  		





  152
  
  
    
                    status=701)


  		





  
  151
  
    
                    'Cannot connect to %s - %s' % (self.url, err))


  		





  153
  152
  
    
            raise


  		





  154
  153
  
    
        return KamakiHTTPResponse(conn)


  		












Also available in:
  Unified diff