Merge pull request #308 from twilio/next-gen-http

Replace Httplib2 with Requests

Author: codejudas

.gitignore

@@ -33,3 +33,6 @@ cover
 
 #htmlcov
 *htmlcov*
+
+# PyEnv
+.python-version

.travis.yml

@@ -1,7 +1,7 @@
 language: python
 python:
+  - "2.6"
   - "2.7"
-  - "3.2"
   - "3.3"
   - "3.4"
   - "3.5"

requirements.txt

@@ -1,4 +1,4 @@
 six
-httplib2
+requests>=2.0.0
 socksipy-branch
 PyJWT==1.4.2

setup.py

@@ -13,11 +13,13 @@
 #
 # You need to have the setuptools module installed. Try reading the setuptools
 # documentation: http://pypi.python.org/pypi/setuptools
-REQUIRES = ["httplib2 >= 0.7", "six", "pytz", "PyJWT == 1.4.2"]
+REQUIRES = ["requests >= 2.0.0", "six", "pytz", "PyJWT >= 1.4.2"]
 
 if sys.version_info < (2, 6):
     REQUIRES.append('simplejson')
-if sys.version_info >= (3,0):
+if sys.version_info < (3, 0):
+    REQUIRES.extend(["cryptography >= 1.3.4", "idna >= 2.0.0", "pyOpenSSL >= 0.14"])
+if sys.version_info >= (3, 0):
     REQUIRES.append('pysocks')
 
 setup(
@@ -31,7 +33,6 @@
     install_requires = REQUIRES,
     # bdist conditional requirements support
     extras_require={
-        ':python_version=="3.2"': ['pysocks'],
         ':python_version=="3.3"': ['pysocks'],
         ':python_version=="3.4"': ['pysocks'],
         ':python_version=="3.5"': ['pysocks'],
@@ -45,8 +46,8 @@
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
+        "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.2",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py32, py33, py34, py35, py36, pypy
+envlist = py26, py27, py33, py34, py35, py36, pypy
 
 [testenv]
 deps= -r{toxinidir}/tests/requirements.txt

twilio/http/http_client.py

@@ -0,0 +1,39 @@
+from requests import Request, Session
+
+from twilio.http import HttpClient, get_cert_file
+from twilio.http.response import Response
+
+
+class TwilioHttpClient(HttpClient):
+    def request(self, method, url, params=None, data=None, headers=None, auth=None, timeout=None,
+                allow_redirects=False):
+        """
+        General purpose HTTP client to make an HTTP request
+
+        :param str method: The HTTP method to use
+        :param str url: The URL to request
+        :param dict params: Query parameters to append to the URL
+        :param dict data: Parameters to go in the body of the HTTP request
+        :param dict headers: HTTP Headers to send with the request
+        :param tuple auth: Basic Auth arguments
+        :param float timeout: Socket/Read timeout for the request
+        :param boolean allow_redirects: Whether or not to allow redirects
+
+        :return: An http response
+        :rtype: A :class:`Response <twilio.rest.http.response.Response>` object
+
+        See the requests documentation for explanation of all these parameters
+        """
+        session = Session()
+        session.verify = get_cert_file()
+
+        request = Request(method.upper(), url, params=params, data=data, headers=headers, auth=auth)
+
+        prepped_request = session.prepare_request(request)
+        response = session.send(
+            prepped_request,
+            allow_redirects=allow_redirects,
+            timeout=timeout,
+        )
+
+        return Response(int(response.status_code), response.content.decode('utf-8'))

twilio/http/httplib2_client.py

@@ -8,9 +8,11 @@
 
 import os
 import platform
+
+from twilio.http.http_client import TwilioHttpClient
+
 from twilio import __version__
 from twilio.exceptions import TwilioException
-from twilio.http.httplib2_client import Httplib2Client
 from twilio.rest.api import Api
 from twilio.rest.chat import Chat
 from twilio.rest.ip_messaging import IpMessaging
@@ -54,7 +56,7 @@ def __init__(self, username=None, password=None, account_sid=None,
 
         self.auth = (self.username, self.password)
         """ :type : tuple(str, str) """
-        self.http_client = http_client or Httplib2Client()
+        self.http_client = http_client or TwilioHttpClient()
         """ :type : HttpClient """
 
         # Domains