8 files changed, 15 insertions, 33 deletions
diff --git a/python-tornado/examples/history-example.py b/python-tornado/examples/history-example.py
index 00bdaf3..879568b 100644
--- a/python-tornado/examples/history-example.py
+++ b/python-tornado/examples/history-example.py
@@ -10,8 +10,7 @@
 ## -----------------------------------
 
 import sys
-import tornado
-from Pubnub import Pubnub
+from Pubnub import PubnubTornado as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
@@ -19,28 +18,13 @@ secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
 cipher_key = len(sys.argv) > 4 and sys.argv[4] or ''
 ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
 
-## -----------------------------------------------------------------------
-## Initiate Pubnub State
-## -----------------------------------------------------------------------
 pubnub = Pubnub(publish_key, subscribe_key, secret_key, cipher_key, ssl_on)
-crazy = 'hello_world'
-
-## -----------------------------------------------------------------------
-## History Example
-## -----------------------------------------------------------------------
-
+channel = 'hello_world'
 
 def history_complete(messages):
     print(messages)
-    tornado.ioloop.IOLoop.instance().stop()
-
-pubnub.history({
-               'channel': crazy,
-               'limit': 10,
-               'callback': history_complete
-               })
-
-## -----------------------------------------------------------------------
-## IO Event Loop
-## -----------------------------------------------------------------------
-tornado.ioloop.IOLoop.instance().start()
+    pubnub.stop()
+
+pubnub.history(channel=channel, count=10, callback=history_complete)
+
+pubnub.start()
diff --git a/python-tornado/examples/publish-example.py b/python-tornado/examples/publish-example.py
index b02c41f..5da6485 100644
--- a/python-tornado/examples/publish-example.py
+++ b/python-tornado/examples/publish-example.py
@@ -10,14 +10,12 @@
 ## -----------------------------------
 
 import sys
-from twisted.internet import reactor
-from Pubnub import Pubnub
+from Pubnub import PubnubTwisted as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
 secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
-cipher_key = len(
-    sys.argv) > 4 and sys.argv[4] or ''  # (Cipher key is Optional)
+cipher_key = len( sys.argv) > 4 and sys.argv[4] or ''
 ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
 
 ## -----------------------------------------------------------------------
diff --git a/python-tornado/examples/subscribe-example.py b/python-tornado/examples/subscribe-example.py
index 0724fa9..26be1fd 100644
--- a/python-tornado/examples/subscribe-example.py
+++ b/python-tornado/examples/subscribe-example.py
@@ -11,7 +11,7 @@
 
 import sys
 import tornado
-from Pubnub import Pubnub
+from Pubnub import PubnubTwisted as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
diff --git a/python-tornado/examples/uuid-example.py b/python-tornado/examples/uuid-example.py
index a1cabf6..e5521ab 100644
--- a/python-tornado/examples/uuid-example.py
+++ b/python-tornado/examples/uuid-example.py
@@ -11,7 +11,7 @@
 
 import sys
 import tornado
-from Pubnub import Pubnub
+from Pubnub import PubnubTwisted as Pubnub
 
 ## -----------------------------------------------------------------------
 ## Initiate Pubnub State
diff --git a/python-tornado/tests/benchmark.py b/python-tornado/tests/benchmark.py
index 636a87a..748fe3b 100644
--- a/python-tornado/tests/benchmark.py
+++ b/python-tornado/tests/benchmark.py
@@ -12,7 +12,7 @@
 import sys
 import datetime
 import tornado
-from Pubnub import Pubnub
+from Pubnub import PubnubTwisted as Pubnub
 
 publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
diff --git a/python-tornado/tests/delivery.py b/python-tornado/tests/delivery.py
index d0eb9f9..0181403 100644
--- a/python-tornado/tests/delivery.py
+++ b/python-tornado/tests/delivery.py
@@ -14,7 +14,7 @@ import datetime
 import time
 import math
 
-from Pubnub import Pubnub
+from Pubnub import PubnubTwisted as Pubnub
 
 ## -----------------------------------------------------------------------
 ## Configuration
diff --git a/python-tornado/tests/subscribe-test.py b/python-tornado/tests/subscribe-test.py
index a2bafde..bcbbc7e 100755
--- a/python-tornado/tests/subscribe-test.py
+++ b/python-tornado/tests/subscribe-test.py
@@ -11,7 +11,7 @@
 
 import sys
 import datetime
-from Pubnub import Pubnub
+from Pubnub import PubnubTwisted as Pubnub
 from functools import partial
 from threading import current_thread
 import threading
diff --git a/python-tornado/tests/unit-tests.py b/python-tornado/tests/unit-tests.py
index 0069a5c..b00f2b7 100644
--- a/python-tornado/tests/unit-tests.py
+++ b/python-tornado/tests/unit-tests.py
@@ -3,7 +3,7 @@ import sys
 
 
 from PubnubUnitTest import Suite
-from Pubnub import Pubnub
+from Pubnub import PubnubTwisted as Pubnub
 
 pubnub = Pubnub("demo", "demo")