refactor rebase for PR#385

Tyson Holub · Tyson Holub · commit c3505e74fc67 · 2017-10-17T13:51:13.000-04:00
diff --git a/twilio/http/http_client.py b/twilio/http/http_client.py
@@ -4,7 +4,6 @@
 from twilio.http.response import Response
 from twilio.http.request import Request as TwilioRequest
 import logging
-import json
 from twilio.compat import urlencode
 
 _logger = logging.getLogger('twilio.http_client')
@@ -39,15 +38,15 @@ def request(self, method, url, params=None, data=None, headers=None, auth=None,
         :rtype: A :class:`Response <twilio.rest.http.response.Response>` object
         """
 
-        kwargs = dict(
-            method=method.upper(),
-            url=url,
-            params=params,
-            data=data,
-            headers=headers,
-            auth=auth,
-            hooks=self.request_hooks
-        )
+        kwargs = {
+            'method': method.upper(),
+            'url': url,
+            'params': params,
+            'data': data,
+            'headers': headers,
+            'auth': auth,
+            'hooks': self.request_hooks
+        }
 
         if params:
             _logger.info('{method} Request: {url}?{query}'.format(query=urlencode(params), **kwargs))
@@ -60,8 +59,7 @@ def request(self, method, url, params=None, data=None, headers=None, auth=None,
         self.last_response = None
         session = self.session or Session()
         request = Request(**kwargs)
-        self.last_request = TwilioRequest(method.upper(), url, auth=auth, params=params, data=data,
-                                          headers=headers)
+        self.last_request = TwilioRequest(**kwargs)
 
         prepped_request = session.prepare_request(request)
         response = session.send(
diff --git a/twilio/http/request.py b/twilio/http/request.py
@@ -13,7 +13,8 @@ def __init__(self,
                  auth=ANY,
                  params=ANY,
                  data=ANY,
-                 headers=ANY):
+                 headers=ANY,
+                 **kwargs):
         self.method = method.upper()
         self.url = url
         self.auth = auth
