Merge branch 'twilio_proxy' of github.com:gustafa/twilio-python into gustafa-twilio_proxy

skimbrel · skimbrel · commit 1a2dbb5a549e · 2013-09-23T17:34:09.000-07:00
Conflicts:
	twilio/rest/__init__.py
	twilio/rest/resources/base.py
diff --git a/twilio/rest/__init__.py b/twilio/rest/__init__.py
@@ -11,6 +11,7 @@
 from twilio.rest.resources import Calls
 from twilio.rest.resources import Conferences
 from twilio.rest.resources import ConnectApps
+from twilio.rest.resources import Connection
 from twilio.rest.resources import MediaList
 from twilio.rest.resources import Members
 from twilio.rest.resources import Messages
@@ -23,8 +24,8 @@
 from twilio.rest.resources import Sip
 from twilio.rest.resources import Sms
 from twilio.rest.resources import Transcriptions
-from twilio.rest.resources import Usage
 from twilio.rest.resources import UNSET_TIMEOUT
+from twilio.rest.resources import Usage
 
 
 def find_credentials():
@@ -39,6 +40,10 @@ def find_credentials():
         return None, None
 
 
+def set_twilio_proxy(proxy_url, proxy_port):
+    Connection.set_proxy_info(proxy_url, proxy_port)
+
+
 class TwilioRestClient(object):
     """
     A client for accessing the Twilio REST API
diff --git a/twilio/rest/resources/__init__.py b/twilio/rest/resources/__init__.py
@@ -25,6 +25,7 @@
 )
 from twilio.rest.resources.calls import Call, Calls
 from twilio.rest.resources.caller_ids import CallerIds, CallerId
+from twilio.rest.resources.connection import Connection
 from twilio.rest.resources.sandboxes import Sandbox, Sandboxes
 from twilio.rest.resources.sms_messages import (
     Sms, SmsMessage, SmsMessages, ShortCode, ShortCodes)
diff --git a/twilio/rest/resources/base.py b/twilio/rest/resources/base.py
@@ -7,6 +7,7 @@
 import twilio
 from twilio import TwilioException, TwilioRestException
 from twilio.rest.resources import UNSET_TIMEOUT
+from twilio.rest.resources.connection import Connection
 from twilio.rest.resources.imports import parse_qs, httplib2, json
 from twilio.rest.resources.util import transform_params, parse_rfc2822_date
 
@@ -56,7 +57,11 @@ def make_request(method, url, params=None, data=None, headers=None,
 
     Currently proxies, files, and cookies are all ignored
     """
-    http = httplib2.Http(timeout=timeout, ca_certs=get_cert_file())
+    http = httplib2.Http(
+        timeout=timeout,
+        ca_certs=get_cert_file(),
+        proxy_info=Connection.proxy_info(),
+    )
     http.follow_redirects = allow_redirects
 
     if auth is not None:
diff --git a/twilio/rest/resources/connection.py b/twilio/rest/resources/connection.py
@@ -0,0 +1,14 @@
+from twilio.rest.resources.imports import httplib2
+
+
+class Connection(object):
+    _proxy_info = None
+
+    @classmethod
+    def proxy_info(cls):
+        return cls._proxy_info
+
+    @classmethod
+    def set_proxy_info(cls, proxy_url, proxy_port):
+        cls._proxy_info = httplib2.ProxyInfo(httplib2.socks.PROXY_TYPE_HTTP,
+                                             proxy_url, proxy_port)

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`)`
`26`	`26`	`from twilio.rest.resources.calls import Call, Calls`
`27`	`27`	`from twilio.rest.resources.caller_ids import CallerIds, CallerId`
	`28`	`+from twilio.rest.resources.connection import Connection`
`28`	`29`	`from twilio.rest.resources.sandboxes import Sandbox, Sandboxes`
`29`	`30`	`from twilio.rest.resources.sms_messages import (`
`30`	`31`	`Sms, SmsMessage, SmsMessages, ShortCode, ShortCodes)`