aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Blum2014-12-08 22:02:47 -0800
committerStephen Blum2014-12-08 22:02:47 -0800
commit7dda31e3db74cb54c77a89e88fd17737db217093 (patch)
tree89ba446635381998e03c9ecebbb0304a84b65212
parente7929e27017bcac522554fa4da44475200938162 (diff)
parentc1f462a0f9e3a5fd806fbd195d2d6e4efe5d8bf8 (diff)
downloadpubnub-python-7dda31e3db74cb54c77a89e88fd17737db217093.tar.bz2
Merge branch 'develop' of https://github.com/pubnub/python into develop
-rw-r--r--Pubnub.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Pubnub.py b/Pubnub.py
index 9d69fa0..970d5e7 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):