Move to requests 0.12.1

diff --git a/kamaki/clients/__init__.py b/kamaki/clients/__init__.py
index 8706262..f319030 100644 (file)
--- a/kamaki/clients/__init__.py
+++ b/kamaki/clients/__init__.py
@@ -43,14 +43,6 @@ sendlog = logging.getLogger('clients.send')
 recvlog = logging.getLogger('clients.recv')
 
 
-# Add a convenience json property to the responses
-def _json(self):
-    try:
-        return json.loads(self.content) if self.content else {}
-    except ValueError:
-        raise ClientError("Invalid JSON reply", self.status_code)
-requests.Response.json = property(_json)
-
 # Add a convenience status property to the responses
 def _status(self):
     return requests.status_codes._codes[self.status_code][0].upper()
@@ -106,8 +98,8 @@ class Client(object):
         for key, val in r.headers.items():
             recvlog.info('%s: %s', key, val)
         recvlog.info('')
-        if not raw and r.text:
-            recvlog.debug(r.text)
+        if not raw and r.content:
+            recvlog.debug(r.content)
         
         if success is not None:
             # Success can either be an in or a collection

diff --git a/setup.py b/setup.py
index 6c6f518..d1730b4 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ from sys import version_info
 import kamaki
 
 
-required = ['ansicolors>=1.0', 'progress>=1.0', 'requests>=0.11']
+required = ['ansicolors==1.0.2', 'progress==1.0.1', 'requests==0.12.1']
 
 if version_info[0:2] < (2, 7):
     required.extend(['argparse', 'ordereddict'])