Fix ssl warnings on Python 2 using requests

codejudas · codejudas · commit 104228fb6e56 · 2017-02-22T15:52:42.000-08:00
diff --git a/setup.py b/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 = ["requests >= 2.0.0", "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(
diff --git a/twilio/http/http_client.py b/twilio/http/http_client.py
@@ -37,6 +37,3 @@ def request(self, method, url, params=None, data=None, headers=None, auth=None,
         )
 
         return Response(int(response.status_code), response.content.decode('utf-8'))
-
-
-

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,3 @@ def request(self, method, url, params=None, data=None, headers=None, auth=None,`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`return Response(int(response.status_code), response.content.decode('utf-8'))`
`40`		`-`
`41`		`-`
`42`		`-`