aboutsummaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorDevendra2014-04-18 01:23:19 +0530
committerDevendra2014-04-18 01:23:19 +0530
commit5d6a3e1356182663b03d62f9258d38459d49017e (patch)
treec0433441e9862b7f1bfc1b2668d33e6e048d8866 /python
parent85416ee30a4f54183e2be30f9ef3cc1363f98c4d (diff)
downloadpubnub-python-5d6a3e1356182663b03d62f9258d38459d49017e.tar.bz2
fixing wrong version detection with python 2.7
Diffstat (limited to 'python')
-rw-r--r--python/Pubnub.py8
-rwxr-xr-xpython/examples/dev-console.py1
2 files changed, 6 insertions, 3 deletions
diff --git a/python/Pubnub.py b/python/Pubnub.py
index 64bc14b..7af2e92 100644
--- a/python/Pubnub.py
+++ b/python/Pubnub.py
@@ -237,8 +237,12 @@ class PubnubBase(object):
self.python_version = 2
self.pc = PubnubCrypto2()
else:
- self.python_version = 3
- self.pc = PubnubCrypto3()
+ if sys.version_info.major == 2:
+ self.python_version = 2
+ self.pc = PubnubCrypto2()
+ else:
+ self.python_version = 3
+ self.pc = PubnubCrypto3()
if not isinstance(self.uuid, str):
raise AttributeError("pres_uuid must be a string")
diff --git a/python/examples/dev-console.py b/python/examples/dev-console.py
index 33ec39f..08e08d9 100755
--- a/python/examples/dev-console.py
+++ b/python/examples/dev-console.py
@@ -10,7 +10,6 @@
## -----------------------------------
import sys
-from twisted.internet import reactor
sys.path.append('../')
sys.path.append('../../')
from Pubnub import Pubnub