Merge branch 'TR-89.88.56.47.55'

Conflicts:
	.gitignore

1 files changed, 17 insertions, 3 deletions

diff --git a/python-tornado/examples/subscribe-example.py b/python-tornado/examples/subscribe-example.py
index c819f94..dfe8010 100644
--- a/python-tornado/examples/subscribe-example.py
+++ b/python-tornado/examples/subscribe-example.py
@@ -12,23 +12,37 @@
 import sys
 import tornado
 sys.path.append('../')
+sys.path.append('../..')
 from Pubnub import 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 'demo' ##(Cipher key is Optional)
 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 )
+pubnub = Pubnub( publish_key=publish_key, subscribe_key=subscribe_key, secret_key=secret_key,cipher_key=cipher_key, ssl_on=ssl_on )
+#pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on )
 crazy  = 'hello_world'
 
+def connect_cb():
+    print 'Connect'
+
+def subscribe_result(response):
+    print response
+
+pubnub.subscribe({
+    'channel' : crazy,
+    'callback' : subscribe_result,
+    'connect' : connect_cb 
+})
 ## -----------------------------------------------------------------------
 ## Publish Example
 ## -----------------------------------------------------------------------
+'''
 def publish_complete(info):
     print(info)
 
@@ -53,7 +67,7 @@ pubnub.publish({
     'message' : { 'some_key' : 'some_val' },
     'callback' : publish_complete
 })
-
+'''
 ## -----------------------------------------------------------------------
 ## IO Event Loop
 ## -----------------------------------------------------------------------