aboutsummaryrefslogtreecommitdiffstats
path: root/Pubnub.py
diff options
context:
space:
mode:
authorDevendra2014-12-18 03:55:29 +0530
committerDevendra2014-12-18 03:55:29 +0530
commit3c53b5d8c909386a69bd50b6b83a17ad4cfba817 (patch)
tree51288baf08777c8b6e02512ecc308b5bf8972922 /Pubnub.py
parent56636c75bf48dc9bf26b320354b5e4130e94dbd8 (diff)
parent7dda31e3db74cb54c77a89e88fd17737db217093 (diff)
downloadpubnub-python-3c53b5d8c909386a69bd50b6b83a17ad4cfba817.tar.bz2
Merge branch 'develop' of github.com:pubnub/python into develop
Diffstat (limited to 'Pubnub.py')
-rw-r--r--Pubnub.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Pubnub.py b/Pubnub.py
index fa553f2..c08b633 100644
--- a/Pubnub.py
+++ b/Pubnub.py
@@ -1660,7 +1660,7 @@ class PubnubTwisted(PubnubCoreAsync):
self.headers['V'] = [self.version]
self.pnsdk = 'PubNub-Python-' + 'Twisted' + '/' + self.version
- def _request(self, request, callback=None, error=None, single=False):
+ def _request(self, request, callback=None, error=None, single=False, timeout=5):
global pnconn_pool
def _invoke(func, data):