Revision bb2e6a2c

b/kamaki/clients/__init__.py
43 43 
recvlog = logging.getLogger('clients.recv')
44 44 

  		





  45
  45
  
    

  		





  46
  
  
    
# Add a convenience json property to the responses


  		





  47
  
  
    
def _json(self):


  		





  48
  
  
    
    try:


  		





  49
  
  
    
        return json.loads(self.content) if self.content else {}


  		





  50
  
  
    
    except ValueError:


  		





  51
  
  
    
        raise ClientError("Invalid JSON reply", self.status_code)


  		





  52
  
  
    
requests.Response.json = property(_json)


  		





  53
  
  
    

  		





  54
  46
  
    
# Add a convenience status property to the responses


  		





  55
  47
  
    
def _status(self):


  		





  56
  48
  
    
    return requests.status_codes._codes[self.status_code][0].upper()


  		





  ......




  106
  98
  
    
        for key, val in r.headers.items():


  		





  107
  99
  
    
            recvlog.info('%s: %s', key, val)


  		





  108
  100
  
    
        recvlog.info('')


  		





  109
  
  
    
        if not raw and r.text:


  		





  110
  
  
    
            recvlog.debug(r.text)


  		





  
  101
  
    
        if not raw and r.content:


  		





  
  102
  
    
            recvlog.debug(r.content)


  		





  111
  103
  
    
        


  		





  112
  104
  
    
        if success is not None:


  		





  113
  105
  
    
            # Success can either be an in or a collection


  		












  

    
      b/setup.py
    
  






  39
  39
  
    
import kamaki


  		





  40
  40
  
    

  		





  41
  41
  
    

  		





  42
  
  
    
required = ['ansicolors>=1.0', 'progress>=1.0', 'requests>=0.11']


  		





  
  42
  
    
required = ['ansicolors==1.0.2', 'progress==1.0.1', 'requests==0.12.1']


  		





  43
  43
  
    

  		





  44
  44
  
    
if version_info[0:2] < (2, 7):


  		





  45
  45
  
    
    required.extend(['argparse', 'ordereddict'])


  		












Also available in:
  Unified diff