8000 Add socksipy dep/import magic for python3 · Twilio-api/twilio-python@b72d4c5 · GitHub
[go: up one dir, main page]
Skip to content

Commit b72d4c5

Browse files
skimbrelskimbrel
committed
Add socksipy dep/import magic for python3
1 parent d13d45e commit b72d4c5

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

‎requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
six
22
httplib2
3+
socksipy

‎setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
REQUIRES.append('simplejson')
1616
if sys.version_info >= (3,0):
1717
REQUIRES.append('unittest2py3k')
18+
REQUIRES.append('socksipy-branch')
1819
else:
1920
REQUIRES.append('unittest2')
2021

‎twilio/rest/resources/connection.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from twilio.rest.resources.imports import httplib2
2+
from twilio.rest.resources.imports import socks
23

34

45
class Connection(object):
@@ -10,5 +11,8 @@ def proxy_info(cls):
1011

1112
@classmethod
1213
def set_proxy_info(cls, proxy_url, proxy_port):
13-
cls._proxy_info = httplib2.ProxyInfo(httplib2.socks.PROXY_TYPE_HTTP,
14-
proxy_url, proxy_port)
14+
cls._proxy_info = httplib2.ProxyInfo(
15+
socks.PROXY_TYPE_HTTP,
16+
proxy_url,
17+
proxy_port,
18+
)

‎twilio/rest/resources/imports.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,9 @@
1515

1616
# httplib2
1717
import httplib2
18+
19+
# socks
20+
try:
21+
from httplib2 import socks
22+
except ImportError:
23+
import socks

0 commit comments

Comments
 (0)
0