aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevendra2014-11-26 19:19:56 +0530
committerDevendra2014-11-26 19:19:56 +0530
commit756b87fd6fb0809605dcc3b35df20a115a9e3ca5 (patch)
treeaff095fed777b7071031397d309d584071135183
parente5e1e7c0cbb92e7d1cefe334136c0a7328720a01 (diff)
downloadpubnub-python-756b87fd6fb0809605dcc3b35df20a115a9e3ca5.tar.bz2
make Jay's azure fix an option
-rw-r--r--Pubnub.py17
1 files changed, 14 insertions, 3 deletions
diff --git a/Pubnub.py b/Pubnub.py
index 83d243e..9d69fa0 100644
--- a/Pubnub.py
+++ b/Pubnub.py
@@ -1483,8 +1483,11 @@ class PubnubHTTPAdapter(HTTPAdapter):
super(PubnubHTTPAdapter, self).init_poolmanager(*args, **kwargs)
s = requests.Session()
-s.mount('http://', PubnubHTTPAdapter(max_retries=1))
-s.mount('https://', PubnubHTTPAdapter(max_retries=1))
+#s.mount('http://', PubnubHTTPAdapter(max_retries=1))
+#s.mount('https://', PubnubHTTPAdapter(max_retries=1))
+#s.mount('http://pubsub.pubnub.com', HTTPAdapter(max_retries=1))
+#s.mount('https://pubsub.pubnub.com', HTTPAdapter(max_retries=1))
+
def _requests_request(url, timeout=5):
try:
@@ -1526,7 +1529,8 @@ class Pubnub(PubnubCore):
uuid=None,
pooling=True,
daemon=False,
- pres_uuid=None
+ pres_uuid=None,
+ azure=False
):
super(Pubnub, self).__init__(
publish_key=publish_key,
@@ -1553,6 +1557,13 @@ class Pubnub(PubnubCore):
self.latest_sub_callback = {'id': None, 'callback': None}
self.pnsdk = 'PubNub-Python' + '/' + self.version
self.daemon = daemon
+
+ if azure is False:
+ s.mount('http://pubsub.pubnub.com', HTTPAdapter(max_retries=1))
+ s.mount('https://pubsub.pubnub.com', HTTPAdapter(max_retries=1))
+ else:
+ s.mount('http://', PubnubHTTPAdapter(max_retries=1))
+ s.mount('https://', PubnubHTTPAdapter(max_retries=1))
def timeout(self, interval, func):
def cb():