Merge pull request #30 from balanced/requests-1.1.0

Requests 1.1.0 is [metal](http://www.youtube.com/watch?v=A43JOxLa5MM)

Author: mjallday

balanced/config.py

@@ -23,7 +23,6 @@ def __init__(self):
                 'Content-Type': 'application/json',
                 'User-agent': _make_user_agent(),
             },
-            'danger_mode': True,
         }
 
     @property

balanced/http_client.py

@@ -27,42 +27,48 @@
 
 def wrap_raise_for_status(http_client):
 
-    def wrapper(response_instance):
-
-        raise_for_status = response_instance.raise_for_status
-
-        def wrapped():
-            try:
-                raise_for_status(allow_redirects=False)
-            except requests.HTTPError, ex:
-                if ex.response.status_code in REDIRECT_STATI:
-                    redirection = exc.MoreInformationRequiredError('%s' % ex)
-                    redirection.status_code = ex.response.status_code
-                    redirection.response = ex.response
-                    redirection.redirect_uri = ex.response.headers['Location']
-                    raise redirection
-                deserialized = http_client.deserialize(
-                    response_instance
-                )
-                response_instance.deserialized = deserialized
-                extra = deserialized.get('additional') or ''
-                if extra:
-                    extra = ' -- {0}.'.format(extra)
-                error_msg = '{name}: {code}: {msg} {extra}'.format(
-                    name=deserialized['status'],
-                    code=deserialized['status_code'],
-                    msg=deserialized['description'].encode('utf8'),
-                    extra=extra.encode('utf8'),
-                )
-                category_code = deserialized.get('category_code', None)
-                error_cls = exc.category_code_map.get(
-                    category_code, exc.HTTPError)
-                http_error = error_cls(error_msg)
-                for error, value in deserialized.iteritems():
-                    setattr(http_error, error, value)
-                raise http_error
-
-        response_instance.raise_for_status = wrapped
+    def handle_exception(response):
+        deserialized = http_client.deserialize(
+            response
+        )
+        response.deserialized = deserialized
+        extra = deserialized.get('additional') or ''
+        if extra:
+            extra = ' -- {0}.'.format(extra)
+        error_msg = '{name}: {code}: {msg} {extra}'.format(
+            name=deserialized['status'],
+            code=deserialized['status_code'],
+            msg=deserialized['description'].encode('utf8'),
+            extra=extra.encode('utf8'),
+            )
+        category_code = deserialized.get('category_code', None)
+        error_cls = exc.category_code_map.get(
+            category_code, exc.HTTPError)
+        http_error = error_cls(error_msg)
+        for error, value in deserialized.iteritems():
+            setattr(http_error, error, value)
+        raise http_error
+
+    def handle_redirect(response):
+        reason = '%s Client Error: %s' % (
+            response.status_code,
+            response.reason,
+            )
+        redirection = exc.MoreInformationRequiredError(reason)
+        redirection.status_code = response.status_code
+        redirection.response = response
+        redirection.redirect_uri = response.headers['Location']
+        raise redirection
+
+    def wrapper(response):
+
+        try:
+            response.raise_for_status()
+        except requests.HTTPError:
+            handle_exception(response)
+        else:
+            if response.status_code in REDIRECT_STATI:
+                handle_redirect(response)
 
     return wrapper
 
@@ -103,8 +109,11 @@ def make_absolute_url(client, url, **kwargs):
         request_body.update(fixed_up_body)
         kwargs['data'] = request_body
         # TODO: merge config dictionaries if it exists.
-        kwargs['config'] = client.config.requests.copy()
+        headers = kwargs.pop('headers', {})
+        headers.update(client.config.requests['base_headers'])
+        kwargs['headers'] = headers
         kwargs['allow_redirects'] = False
+
         kwargs['hooks'] = {
             'response': wrap_raise_for_status(client)
         }
@@ -137,31 +146,28 @@ def __init__(self, keep_alive=True, *args, **kwargs):
     def get(self, uri, **kwargs):
         kwargs = self.serialize(kwargs.copy())
         resp = self.interface.get(uri, **kwargs)
-        if kwargs.get('return_response', True):
-            resp.deserialized = self.deserialize(resp)
+        resp.deserialized = self.deserialize(resp)
         return resp
 
     @munge_request
     def post(self, uri, data=None, **kwargs):
         data = self.serialize({'data': data}).pop('data')
         resp = self.interface.post(uri, data=data, **kwargs)
-        if kwargs.get('return_response', True):
-            resp.deserialized = self.deserialize(resp)
+        resp.deserialized = self.deserialize(resp)
         return resp
 
     @munge_request
     def put(self, uri, data=None, **kwargs):
         data = self.serialize({'data': data}).pop('data')
         resp = self.interface.put(uri, data=data, **kwargs)
-        if kwargs.get('return_response', True):
-            resp.deserialized = self.deserialize(resp)
+        resp.deserialized = self.deserialize(resp)
         return resp
 
     @munge_request
     def delete(self, uri, **kwargs):
         kwargs = self.serialize(kwargs.copy())
         resp = self.interface.delete(uri, **kwargs)
-        if kwargs.get('return_response', True) and resp.status_code != 204:
+        if resp.status_code != 204:
             resp.deserialized = self.deserialize(resp)
         return resp
 

requirements.txt

@@ -2,5 +2,5 @@ certifi==0.0.8
 chardet==1.0.1
 simplejson==2.3.2
 iso8601==0.1.4
-requests>=0.11, <0.12
+requests==1.1.0
 mock>=0.8,<0.9

tests/test_client.py

@@ -25,17 +25,29 @@ def test_default_config(self):
         self.assertEqual(config.version, 'v1')
 
 
+def no_hook(client, http_op, url, kwargs):
+    kwargs.pop('hooks', None)
+
+
 class TestClient(unittest.TestCase):
+
+    def setUp(self):
+        before_request_hooks.append(no_hook)
+
+    def tearDown(self):
+        while before_request_hooks:
+            before_request_hooks.pop()
+
     def test_http_operations(self):
+
         ops = ['get', 'post', 'put', 'delete']
         for op in ops:
-            request = getattr(balanced.http_client, op)(
+            response = getattr(balanced.http_client, op)(
                 'hithere',
-                return_response=False
             )
-            self.assertEqual(request.method, op.upper())
+            self.assertEqual(response.request.method, op.upper())
             self.assertEqual(
-                request.url, 'https://api.balancedpayments.com/v1/hithere'
+                response.url, 'https://api.balancedpayments.com/v1/hithere'
             )
 
     def test_client_reference_config(self):
@@ -55,11 +67,12 @@ def test_client_key_switch(self):
 
     def test_before_request_hook(self):
         momo = mock.Mock()
+
+        before_request_hooks.append(no_hook)
         before_request_hooks.append(momo)
 
         balanced.http_client.get(
             'hithere',
-            return_response=False
         )
         self.assertEqual(momo.call_count, 1)
         args, _ = momo.call_args
@@ -119,10 +132,9 @@ def test_wrap_raise_for_status(self):
         response.raise_for_status.side_effect = ex
 
         wrapped = wrap_raise_for_status(client)
-        wrapped(response)
 
         with self.assertRaises(balanced.exc.HTTPError) as ex:
-            response.raise_for_status()
+            wrapped(response)
         self.assertEqual(ex.exception.description, api_response['description'])