Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions twilio/http/http_client.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import logging

from requests import Request, Session, hooks
from requests.adapters import HTTPAdapter

from twilio.compat import urlencode
from twilio.http import HttpClient
from twilio.http.response import Response
from twilio.http.request import Request as TwilioRequest
import logging
from twilio.compat import urlencode
from twilio.http.response import Response

_logger = logging.getLogger('twilio.http_client')

Expand All @@ -14,7 +14,9 @@ class TwilioHttpClient(HttpClient):
"""
General purpose HTTP Client for interacting with the Twilio API
"""
def __init__(self, pool_connections=True, request_hooks=None, timeout=None, logger=_logger, proxy=None, max_retries=None):

def __init__(self, pool_connections=True, request_hooks=None, timeout=None, logger=_logger, proxy=None,
max_retries=None):
"""
Constructor for the TwilioHttpClient

Expand Down Expand Up @@ -96,6 +98,6 @@ def request(self, method, url, params=None, data=None, headers=None, auth=None,
method=method, status=response.status_code, text=response.text)
)

self.last_response = Response(int(response.status_code), response.text)
self.last_response = Response(int(response.status_code), response.text, response.headers)

return self.last_response
6 changes: 2 additions & 4 deletions twilio/http/response.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
class Response(object):
"""

"""
def __init__(self, status_code, text):
def __init__(self, status_code, text, headers=None):
self.content = text
self.headers = headers
self.cached = False
self.status_code = status_code
self.ok = self.status_code < 400
Expand Down