From 5d6a3e1356182663b03d62f9258d38459d49017e Mon Sep 17 00:00:00 2001
From: Devendra
Date: Fri, 18 Apr 2014 01:23:19 +0530
Subject: fixing wrong version detection with python 2.7

---
 python/Pubnub.py               | 8 ++++++--
 python/examples/dev-console.py | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'python')

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
-- 
cgit v1.2.3